stax 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977f337dd555b2e8941cb23a8493af6ada396a3eeba4af49264a26ca7a022d4c
-  data.tar.gz: cb54eca3f8cad6131164e33b6704c69d48b4ca3b089e07ec27e978beca853ad0
+  metadata.gz: ff348fae4586ba8565b0716cafbd57a2804fa9ead68069195ec351815833201b
+  data.tar.gz: dcae498f9406661f84112b0034c15a844a1945ef746e19188c05fce565c8e9ed
 SHA512:
-  metadata.gz: f44ff1358eef0fb11b44bdcee1f040757506c5792178b1e895b8e7ebf1f38d6ac43edd39c88effe79e9c257ccf44c6a0db84627e331047ddfdeeb9675b7c2bfb
-  data.tar.gz: b9d0c14a3b6a99354ecce5f32a8bdf31482abcaffe730d1a76919daa34d0396edb09fc2bf281360613b8abcf2f6f6575795dfdab4d7004dbe600930d93d17296
+  metadata.gz: e6469ff904a334f9fd228f14c754c59f6b273d9bd0916ca367cabdad103f72d29993f45f6101a12215249197d32fc7dd6cfa1bd78cdbe45c17508b0baa24f223
+  data.tar.gz: 75cae424254fc98fb6696051b2d08e3f1c6a045f54c64e257fb78a6cf65ad6f86f220ab5482568803e396568ae7a5d64b677577b69674ff99f9c455095ec0b38

data/lib/stax/docker.rb

@@ -1,4 +1,3 @@
-require 'stax/aws/sts'
 require 'stax/aws/ecr'
 
 module Stax
@@ -7,7 +6,7 @@ module Stax
     no_commands do
       ## default to ECR registry for this account
       def docker_registry
-        @_docker_registry ||= "#{Aws::Sts.id.account}.dkr.ecr.#{ENV['AWS_REGION']}.amazonaws.com"
+        @_docker_registry ||= "#{aws_account_id}.dkr.ecr.#{aws_region}.amazonaws.com"
       end
 
       ## name the docker repo after the git repo
@@ -21,7 +20,7 @@ module Stax
       end
 
       ## build a docker image locally
-      def docker_local_build
+      def docker_build
         debug("Docker build #{docker_image}")
         system "docker build -t #{docker_image} #{Git.toplevel}"
       end
@@ -31,28 +30,6 @@ module Stax
         debug("Docker push #{docker_image}")
         system "docker push #{docker_image}"
       end
-
-      ## override this for your argus setup
-      def docker_argus_queue
-        @_docker_argus_queue ||= Aws::Sqs.queue_url('argus.fifo')
-      end
-
-      def docker_argus_build
-        debug("Sending to argus #{Git.branch}:#{Git.sha}")
-        org, repo = Git.repo.split('/')
-        Aws::Sqs.send(
-          queue_url: docker_argus_queue,
-          message_group_id: repo,
-          message_body: {
-            org:    org,
-            repo:   repo,
-            branch: Git.branch,
-            sha:    Git.sha,
-          }.to_json
-        ).tap do |r|
-          puts r&.message_id
-        end
-      end
     end
 
     desc 'registry', 'show registry name'
@@ -73,8 +50,7 @@ module Stax
     ## override this method with the desired builder
     desc 'build', 'build docker image'
     def build
-      docker_local_build
-      # docker_argus_build
+      docker_build
     end
 
     desc 'login', 'login to registry'
@@ -103,4 +79,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/staxfile.rb

@@ -1,6 +1,7 @@
 module Stax
   @@_root_path = nil
   @@_stack_list = []
+  @@_command_list = []
 
   ## the stax root is defined as location of Staxfile
   def self.root_path
@@ -12,6 +13,11 @@ module Stax
     @@_stack_list
   end
 
+  ## list of commands defined in Staxfile
+  def self.command_list
+    @@_command_list
+  end
+
   ## search up the dir tree for nearest Staxfile
   def self.find_staxfile
     Pathname.pwd.ascend do |path|
@@ -24,6 +30,7 @@ module Stax
     if root_path
       load(root_path.join('Staxfile'))
       require_stacks
+      require_commands
     end
   end
 
@@ -35,6 +42,14 @@ module Stax
     end
   end
 
+  ## auto-require any command lib files
+  def self.require_commands
+    command_list.each do |command|
+      f = root_path.join('lib', "#{command}.rb")
+      require(f) if File.exist?(f)
+    end
+  end
+
   ## add a stack by name, creates class as needed
   def self.add_stack(name, opt = {})
     @@_stack_list << name
@@ -64,9 +79,14 @@ module Stax
   end
 
   ## add a non-stack command at top level
-  def self.add_command(name, klass)
+  def self.add_command(name, klass = nil)
+    @@_command_list << name
+
+    ## class defaults to eg Stax::Name::Cmd
+    klass ||= self.const_get(name.to_s.split(/[_-]/).map(&:capitalize).join + '::Cmd')
+
     Cli.desc(name, "#{name} commands")
     Cli.subcommand(name, klass)
   end
 
-end
+end

data/lib/stax/version.rb

@@ -1,3 +1,3 @@
 module Stax
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Richard Lister
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -624,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Control Cloudformation stack and other stuff.