rops 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb5a82425bbec9b72446bf0fc951985a6c0fc95b875fbdeac257e5133d021d7
-  data.tar.gz: d83f7db41bae9b5f4e29b754ce6cfc61fabd32bd8eb6fa5b930361747baaea52
+  metadata.gz: 4aaa2c9386c4426ae0e64d6c9136e208683d396af5175436e29105bd53be14f9
+  data.tar.gz: 2ca5c4ff6f0ff34ccdadc1a09113a3d5e4ea61d9022bc8476bb37190ccab92ab
 SHA512:
-  metadata.gz: 642018bd50292fe94b178dc2b2af86a8b310b876f23149e280492d997fb5a02f2b1532b780ceae53cde1039eec0596dd38410152dd17e19e15a7e2cec035d959
-  data.tar.gz: 8c665f40bc3a6cb2ac2b29192bd64bff907da8d2285b49a95467ae6bc0e6cd60819cff61c9b084e7a60783769652109725b5d8220164862fb44e9f25f2687897
+  metadata.gz: 4764f72f23aaa3c3a7694328cabfcea48b509fa109ae9af4487dc8b965b6c4060bb7a59d501a31eee9377983a6837da118c7fb75d1a1b497008a16678d72f17d
+  data.tar.gz: c3249a2060872d2606b4118c8a21b173a5aeec58d19d81d2d38f2d21ce3995280f59e3cf0d23100e470b3facb57a416c343d84cca9f09271a1b768d208ab7828

data/Gemfile.lock

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

data/bin/rops

@@ -28,10 +28,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 +142,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 +152,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 +195,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,10 +225,10 @@ 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)

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')
@@ -44,8 +45,8 @@ class Deployer
 
     short_id = @commit[0, 8]
     @image_tag = "g#{short_id}"
-    if branch.present? && (branch != default_branch) && !branch.start_with?(short_id)
-      @image_tag += "-#{branch}"
+    if (@branch != default_branch) && !@branch.start_with?(short_id)
+      @image_tag += "-#{@branch}"
     end
     images.each do |image|
       image.commit = commit
@@ -54,8 +55,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"
@@ -68,7 +68,7 @@ class Deployer
     end
 
     statuses, stderr, success = kubectl(context, cmd)
-    unless success || stderr.match(/not found/)
+    unless (success || stderr.match(/not found/)) && statuses.present?
       puts stderr  if stderr.present?
       return nil
     end
@@ -93,8 +93,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 +121,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
@@ -54,7 +51,9 @@ class Image
   end
 
   def local_exists?
-    system("#{Deployer.docker} image exists #{local_image}")
+    if @local_exists.nil?
+      @local_exists = system("#{Deployer.docker} image exists #{local_image}")
+    end
   end
 
   def remote_image
@@ -68,7 +67,7 @@ class Image
       if status.success? || stderr.include?('error parsing manifest blob')
         @remote_exists = true
       else
-        puts stderr  if stderr.present? && !stderr.include?('manifest unknown')
+        puts stderr  if stderr.present? && !stderr.include?('manifest unknown') && !stderr.include?('no such manifest')
         @remote_exists = false
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rops
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Steve Sloan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -107,10 +107,12 @@ 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
 homepage: https://github.com/Record360/rops
 licenses:
 - MIT