openstax_aws 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ed7cb99a4131a436325e8766d03f6a62accbd62a700a6238a0a6278ae1e6e5
-  data.tar.gz: 46f26ea0c266cf1c1ca1b0cf7c5307848bf8be3c5097c7fe16472a1fe3115f81
+  metadata.gz: 375c4b62f3bd1ed25994dfb639f7233dee7c593bb8e07a67161d9de257e0732f
+  data.tar.gz: b7a84e86e1bf7b954a8700dc9c479069e5e0d4d75a565f8d00ee0d365f4141c5
 SHA512:
-  metadata.gz: 1871bbb908ecbfb58eb782fae57f960cf1db1a066adf8003c14115756273656a51aa2c32e061bb8fcc6607fe06633fd6936b7d71da38c907d313aa9d5509ad8b
-  data.tar.gz: 82108d04dde247454dfeafe8450a2bfed4ffe40d8d00c45dea2693501ae9693e7e77be618605cf3f49cb647bdb6cdf0b78e1cac71b37f3fe0fbe94543a1ffac8
+  metadata.gz: a82917718080f27c4cc1768444d2723ffb61ddb13764ab3087309ae0d8930a0edfe6c5db46f7391597919c425dd6c8eded1c2f738ca9cbcfd348e41606007d5c
+  data.tar.gz: d1c342c3e2043b8ae0cb4d1c936d73132676fb713b688bb759700ca34acd3504f8f7bcced088312e78744b10c7c2efe5621a8eddf528b04e917306c3d49bd475

data/.github/workflows/tests.yml

@@ -4,28 +4,18 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   tests:
     timeout-minutes: 10
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-pr-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-pr-
+          ruby-version: 3.1
+          bundler-cache: true
       - name: Test
-        run: |
-          gem install bundler --force --no-document --version 2.1.4
-          bundle config path vendor/bundle
-          bundle config jobs 2
-          bundle install
-          bundle exec rspec
+        run: bundle exec rspec

data/lib/openstax/aws/build_image_command_1.rb

@@ -19,8 +19,6 @@ module OpenStax
                 )
         end
 
-        deployment_sha ||= OpenStax::Aws::GitHelper.current_sha
-
         ami_name = "#{ami_name_base}@#{sha[0..6]} #{Time.now.utc.strftime("%y%m%d%H%MZ")}"
 
         @packer = OpenStax::Aws::PackerFactory.new_packer(
@@ -33,7 +31,7 @@ module OpenStax
         @packer.var("region", region)
         @packer.var("ami_name", ami_name)
         @packer.var("sha", sha)
-        @packer.var("deployment_sha", deployment_sha)
+        @packer.var("deployment_sha", deployment_sha) unless deployment_sha.nil?
         @packer.var("playbook_file", playbook_absolute_file_path)
         @packer.var("ami_description", {
           sha: sha,

data/lib/openstax/aws/git_helper.rb

@@ -23,8 +23,9 @@ module OpenStax::Aws
       end
     end
 
-    def self.current_sha
-      ::Git.revparse('HEAD')
+    def self.local_repo_sha(path: nil)
+      path ||= Dir.pwd
+      ::Git.open(path).revparse('HEAD')
     end
   end
 end

data/lib/openstax/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Aws
-    VERSION = "1.6.0"
+    VERSION = "2.0.0"
   end
 end

data/openstax_aws.gemspec

@@ -40,15 +40,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-s3", "~> 1"
   spec.add_dependency "aws-sdk-ssm", "~> 1"
 
-  spec.add_dependency 'git'
   spec.add_dependency "activesupport"
+  spec.add_dependency "git"
+  spec.add_dependency "ox"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "vcr", ">= 6.1"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "dotenv"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_aws
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,14 +268,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement