rops 1.0.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b842710deb5849c4ee8342b766505a55c8e6778db4afbb79c6fa20768d6e43c
-  data.tar.gz: fe1df084466ab6019f9f85ba958ecda306f44757ff505ede0b8867f639e86706
+  metadata.gz: 35e79d0ac5ba9b1b390e4764445c2d7ea0baefbb6f87546f951b350b56845f4a
+  data.tar.gz: 50b2360868d759353b36cf1fc0e27439762fe973eb6b57c14240a1b747d6a992
 SHA512:
-  metadata.gz: 5039b8251bb501bd3ac8c4006ae82f23d998e2dc57c6a7c0e579c55d62140a2e9f517a3a3c61d373b30c5ed3211c90f035d86b91fca5d65fd765d883095d2ba0
-  data.tar.gz: 88fc34f86355c4c2917c916712ca1e3bbd7077c736e66a56081b4b9517d6ef646f022143732374d1fe1540110935f7fd8e7e6ff79f3c01d82dfc9d5ca57fed7f
+  metadata.gz: 9481dce3e2fd292a47ea25ad00df8b230f47061f060b3fd65514b9f8e063c8645808a30a807f6a85055751948783b2f7dfd46891c632e7934cd874bd5359cca5
+  data.tar.gz: 05b384626c27d7d0582c6000259acfa2f118734a8e25e30b1041bf481fedbb4bf23fc2d980b3d8da6ba46f0939dfdfab95561a0c8810b1d7f2cf9b69b3c5fc4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rops (1.0.6)
+    rops (1.1.0)
       activesupport (~> 6.1.4)
       dry-cli (~> 0.7.0)
       git (~> 1.9.1)

data/bin/rops

@@ -9,6 +9,7 @@ require 'hashdiff'
 
 require 'core_ext'
 require 'deployer'
+require 'version'
 
 module Record360
   module Operations
@@ -28,10 +29,11 @@ module Record360
         super()
       end
 
-      def call(root: nil, branch: nil, context: nil, **)
+      def call(branch: nil, context: nil, root: nil, specs: nil, **)
         @root = root  if root
         @deployer ||= Deployer.new(@root)
         deployer.branch = branch  if branch
+        deployer.spec_dir = specs  if specs
         @context = context || deployer.default_context
       end
 
@@ -141,6 +143,7 @@ module Record360
     class CurrentStatus < Dry::CLI::Command
       desc "Display status of all running specs"
       argument :context, desc: "Kubernetes context"
+      option :specs, desc: "Kubernetes specification directory"
       include Common
 
       def call(**)
@@ -150,8 +153,8 @@ module Record360
     end
 
     class BuildImage < Dry::CLI::Command
-      desc "Build the docker image" #" (COMMIT=#{DEFAULT_COMMIT})"
-      argument :branch, desc: "Branch (or commit) to build" #, default: DEFAULT_COMMIT
+      desc "Build the docker image"
+      argument :branch, desc: "Branch (or commit) to build"
       include Common
 
       def call(**)
@@ -193,9 +196,10 @@ module Record360
       desc "Deploy the docker image to the cluster"
       argument :branch,  desc: "Branch (or commit) to build"
       argument :context, desc: "Kubernetes context"
+      option :specs, desc: "Kubernetes specification directory"
       include Common
 
-      def call(**)
+      def call(specs: nil, **)
         super
         if context == production_context
           if branch.blank?
@@ -222,20 +226,28 @@ module Record360
         end
 
         if $stdout.tty?
-          print "Deploy #{branch} (#{image_tag}) to #{context}? (y/N): "
+          print "Deploy #{deployer.branch} (#{image_tag}) to #{context}? (y/N): "
           exit(-1)  unless $stdin.gets&.chomp == 'y'
         else
-          puts "Deploying #{branch} (#{image_tag}) to #{context}"
+          puts "Deploying #{deployer.branch} (#{image_tag}) to #{context}"
         end
 
         deployer.deploy!(context)
       end
     end
 
+    class Version < Dry::CLI::Command
+      desc "output version information and exit"
+      def call
+        puts VERSION
+      end
+    end
+
     register 'status', CurrentStatus
     register 'build',  BuildImage
     register 'push',   PushImage
     register 'deploy', DeployImage
+    register 'version', Version
   end
 end
 

data/lib/buildable.rb

@@ -0,0 +1,17 @@
+class Buildable
+  attr_reader :name, :repository, :commit
+  attr_writer :commit
+
+  def initialize(name:, repository:, commit:)
+    @name = name.downcase
+    @repository = repository
+    @commit = commit
+  end
+
+  def checkout  # :yields: source directory
+    Dir.mktmpdir("#{name}-build") do |dir|
+      system("git -C #{repository} archive #{commit} | tar -x -C #{dir}") or raise "Git error"
+      yield dir
+    end
+  end
+end

data/lib/deployer.rb

@@ -18,6 +18,7 @@ class Deployer
   attr_reader :root, :repository, :registry, :ssh_host, :images
   attr_reader :default_branch, :default_context, :production_context
   attr_reader :branch, :commit, :image_tag
+  attr_accessor :spec_dir
 
   def self.docker
     @docker_path ||= File.which('docker') || File.which('podman')
@@ -42,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.present? && (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
@@ -54,8 +51,7 @@ class Deployer
   end
 
   def specs_running(context = nil)
-    context ||= default_context
-    context = context.to_s
+    context = (context || default_context).to_s
     specs = deploy_specs(context)
 
     cmd = String.new "--output=json"
@@ -93,8 +89,7 @@ class Deployer
   end
 
   def deploy!(context)
-    context ||= default_context
-    context = context.to_s
+    context = (context || default_context).to_s
     specs = deploy_specs(context).presence  or raise "No kubernetes specs to deploy"
     stdout, stderr, _success = kubectl(context, 'apply -f -', YAML.dump_stream(*specs))
     puts stdout  if stdout.present?
@@ -122,11 +117,11 @@ class Deployer
   end
 
   def specs(context = nil)
-    context ||= default_context
-    context = context.to_s
-    @specs[context] ||= begin
-      paths = git.ls_tree(commit, "platform/#{context}/")['blob'].keys
-      raise "No specs found for context #{context}"  unless paths.present?
+    spec_dir = self.spec_dir.presence || (context || default_context).to_s
+    @specs[spec_dir] ||= begin
+      spec_dir = "platform/#{spec_dir}/"
+      paths = git.ls_tree(commit, spec_dir)['blob'].keys
+      raise "No specs found in #{spec_dir}"  unless paths.present?
       paths.map { |path| YAML.load_stream( git.show(commit, path) ) }.flatten.compact
     end
   end

data/lib/image.rb

@@ -1,16 +1,15 @@
-class Image
+require 'buildable'
+
+class Image < Buildable
   def self.build_cores
     @build_cores ||= ENV.fetch('R360_BUILD_CORES', [ 1, Concurrent::Utility::ProcessorCounter.new.processor_count - 1 ].max).to_i
   end
 
-  attr_reader :name, :repository, :dockerfile, :commit, :tag, :registry
-  attr_writer :commit
+  attr_reader :dockerfile, :tag, :registry
 
-  def initialize(name:, repository:, dockerfile:, commit:, tag:, registry:)
-    @name = name.downcase
-    @repository = repository
+  def initialize(name:, repository:, commit:, dockerfile:, tag:, registry:)
+    super(name: name, repository: repository, commit: commit)
     @dockerfile = dockerfile
-    @commit = commit
     @tag = tag
     @registry = registry
   end
@@ -22,9 +21,7 @@ class Image
 
   def build!
     return  if local_exists?
-
-    Dir.mktmpdir("#{name}-build") do |dir|
-      system("git -C #{repository} archive #{commit} | tar -x -C #{dir}") and
+    checkout do |dir|
       system("#{Deployer.docker} build -f #{dockerfile} -t #{local_image} --build-arg JOBS=#{Image.build_cores} --build-arg GIT_VERSION=#{commit} #{dir}")
     end
   end

data/lib/site.rb

@@ -0,0 +1,14 @@
+require 'buildable'
+
+class Site < Buildable
+  attr_reader :script         # NPM build script
+  attr_reader :bucket         # S3 bucket
+  attr_reader :distribution   # CloudFront distribution
+
+  def initialize(name:, repository:, commit:, script:, bucket:, distribution:)
+    super(name: name, repository: repository, commit: commit)
+    @script = script
+    @bucket = bucket
+    @distribution = distribution
+  end
+end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rops
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Sloan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -107,10 +107,13 @@ files:
 - LICENSE
 - README.md
 - bin/rops
+- lib/buildable.rb
 - lib/core_ext.rb
 - lib/deployer.rb
 - lib/git_ext.rb
 - lib/image.rb
+- lib/site.rb
+- lib/version.rb
 homepage: https://github.com/Record360/rops
 licenses:
 - MIT