rops 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677ba9efdca09746476e2a76a9db789b2d2447299c4db042abf8a6efb006daa8
-  data.tar.gz: 582cf70c64c5fb0b406493b6f0de6c1de3fc70c397f3e242c1698ce8c4d47a57
+  metadata.gz: 5c03621bf9e8019dbc60a1e01584088cefe4b6b0cf4ddc262f6d7141b9cd0020
+  data.tar.gz: f3f7ba0e78dfac69c2f496e2536a2dea1cc2ff93f9d03f26208fe0e7ba741955
 SHA512:
-  metadata.gz: 4e08c7745eeb866456a74c87235393ee6236d25327c6cf28a4cbd48493f456fe34d8403f94563f813a6f307cebddc74b7410d9a710fbf3e148bfacffe90dac20
-  data.tar.gz: fe9ae57e5109c786b9dca9fc98bc17d9fcfd9c84c8ff8db04f5a04dba4b6c8c976c8f775d5f4f96b4c11e58d8d9ee62f17f87b437e9e14ae53f370fedd71c2a9
+  metadata.gz: a3bc57222a2437c4135b5613c81d41c4047a6a8aa2cc7d689f6d35537f71b85de04c7c1c21096c6eef7856067da2f6ddfbdb7f3012a0902768664245e604ed5b
+  data.tar.gz: 8621cb2b09845b1afd1b09abd0261db5fdcdace893c80ffde92c3ff43c23aead39427806472900fef211aab8578d40a2be99e04b461a7dc7aad618b60cf62ebd

data/Gemfile.lock

@@ -1,59 +1,59 @@
 PATH
   remote: .
   specs:
-    rops (1.4.1)
+    rops (1.4.4)
       activesupport (~> 7.0.3)
       dry-cli (~> 0.7.0)
       git (>= 1.9.1, < 1.14.0)
       hashdiff (~> 1.0.1)
       liquid (~> 5.4.0)
-      net-ssh (~> 6.1.0)
+      net-ssh (~> 7.0.1)
       ptools (~> 1.4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.1)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     dry-cli (0.7.0)
-    git (1.13.0)
+    git (1.13.2)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hashdiff (1.0.1)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     liquid (5.4.0)
-    minitest (5.17.0)
-    net-ssh (6.1.0)
+    minitest (5.20.0)
+    net-ssh (7.0.1)
     ptools (1.4.3)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rchardet (1.8.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    tzinfo (2.0.5)
+    rspec-support (3.12.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    webmock (3.18.1)
+    webmock (3.19.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/bin/rops

@@ -31,22 +31,13 @@ module Record360
 
       def call(branch: nil, context: nil, root: nil, specs: nil, **)
         @root = root  if root
-        @deployer ||= Deployer.new(@root)
-        deployer.branch = branch  if branch
+        @deployer ||= Deployer.new(@root, branch: branch)
         deployer.spec_dir = specs  if specs
         @context = context || deployer.default_context
       end
 
     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?
@@ -148,49 +139,6 @@ 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"
@@ -294,7 +242,6 @@ module Record360
       end
     end
 
-    register 'ready',  ReadyTag
     register 'status', CurrentStatus
     register 'build',  BuildImage
     register 'push',   PushImage

data/lib/deployer.rb

@@ -24,11 +24,11 @@ class Deployer
     docker.include?('podman')
   end
 
-  def initialize(root = nil)
+  def initialize(root = nil, branch: nil)
     @specs = {}
     @root = root || Dir.pwd
     load_config
-    self.branch = default_branch
+    self.branch = branch.presence || default_branch
   end
 
   def branch=(branch)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Record360
   module Operations
-    VERSION = '1.4.2'
+    VERSION = '1.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rops
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Steve Sloan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - lib/deployer.rb
 - lib/git_ext.rb
 - lib/image.rb
+- lib/ready.rb
 - lib/site.rb
 - lib/version.rb
 homepage: https://github.com/Record360/rops
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Record360 Operations tool