supermarket_sync 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a518a7503723522c18fbb65db7766c9188728a8421b64a28dda5e3b65b2433
-  data.tar.gz: 7bf193b9587237aed34ab1272114e4046da7dc7deab0d670a5075fcbca091d66
+  metadata.gz: 2143773eceb2c709194462cddbe7e86668103200914d3320ba484b44f49bfe41
+  data.tar.gz: a7f2c525fc4d4c4aa8e802cbcc5129f58677755c0dcf68a698932dac3c05cb6a
 SHA512:
-  metadata.gz: 4d1b8edab2bf62739d39ea24a1b5b984043118548c54d3827a875316bacde7f347df17f463931ac026407069597599a665e161a918b86822d6008b3bd7f458b8
-  data.tar.gz: 2a550526c4a2e07b7c185bc81bb92c57b571bab389612b69d7057322b95642d49541ca510bb15c18c96a1f00f66c6f214293d8da106ea983d544f0dbc746c70a
+  metadata.gz: 376808c3196ea284e269c1dcb7b03b8e95ab80e0e402d0d6c37ce363f4c18d89e10fa0e82ca7c835837bc7be2999f8aa9f242851b405d7307a76966af4a715c9
+  data.tar.gz: 74cc90b50981dce699e683545fc1c95fa6bb1541469c2bbe845191c3ef51762a5ef8a3b25f4a1a7ef589642f35405808f28a8892faa2ffc4d817895c719ac864

data/.github/workflows/ruby.yml

@@ -0,0 +1,36 @@
+name: Ruby
+on: [push]
+jobs:
+  test:
+    name: Build
+    runs-on: ubuntu-latest
+    container: ruby:3.0
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Git Info
+        id: git
+        run: |
+          echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
+          echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
+          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+
+      - name: Test
+        env:
+          ABC: '123'
+        run: |
+          gem install rubocop --no-document
+          rubocop
+
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          ABC: '123'
+        run: |
+          gem install dpl --no-document
+          find . -type f -exec chmod o--w "{}" \;
+
+      - run: dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY --gem=supermarket_sync

data/.gitlab-ci.yml

@@ -4,8 +4,8 @@ before_script:
   - gem install bundler --no-document
   - bundle install --jobs $(nproc) --path vendor/bundle
 
-test:Ruby 2.5:
-  image: ruby:2.5
+test:Ruby 3.0:
+  image: ruby:3.0
   cache:
     paths:
       - .bundle
@@ -13,12 +13,12 @@ test:Ruby 2.5:
   script:
     - bundle exec rubocop
   tags:
-    - ruby
+    - docker
   except:
     - tags
 
-release:Ruby 2.5:
-  image: ruby:2.5
+release:Ruby 3.0:
+  image: ruby:3.0
   cache:
     paths:
       - .bundle
@@ -33,6 +33,6 @@ release:Ruby 2.5:
     paths:
       - ./*.gem
   tags:
-    - ruby
+    - docker
   only:
     - tags

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-3.0.2

data/CHANGELOG.md

@@ -2,12 +2,20 @@ SupermarketSync Changelog
 =========================
 This file is used to list changes made in each version of the `supermarket_sync` gem.
 
-v0.1.1 (2016-11-12)
+v0.1.3 (2019-8-2)
+-------------------
+- Ignore cookbook category due to deprecation
+
+v0.1.2 (2018-11-12)
+-------------------
+- Expose more configuration via environment variables
+
+v0.1.1 (2018-11-12)
 -------------------
 - Fix for non-existing cookbooks
 - Rename function to avoid potential namespace collision
 - Add a read-only mode for testing purposes
 
-v0.1.0 (2016-11-09)
+v0.1.0 (2018-11-09)
 -------------------
 - Initial Release

data/lib/supermarket_sync/cli.rb

@@ -5,7 +5,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright:: 2018, Brian Dwyer - Broadridge Financial Solutions
+# Copyright:: 2021, Brian Dwyer - Broadridge Financial Solutions
 #
 
 require 'mixlib/cli'

data/lib/supermarket_sync/config.rb

@@ -5,7 +5,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright:: 2018, Brian Dwyer - Broadridge Financial Solutions
+# Copyright:: 2021, Brian Dwyer - Broadridge Financial Solutions
 #
 
 require 'supermarket_sync/helpers/configuration'
@@ -25,10 +25,10 @@ module SupermarketSync
     define_setting :author, 'Brian Dwyer - Broadridge Financial Services'
 
     # => Config File
-    define_setting :config_file, File.join(root, 'config', 'config.json')
+    define_setting :config_file, ENV['SM_SYNC_CONFIG'] || File.join(root, 'config', 'config.json')
 
     # => Cookbooks File
-    define_setting :cookbooks_file, File.join(root, 'config', 'cookbooks.json')
+    define_setting :cookbooks_file, ENV['SM_SYNC_COOKBOOKS'] || File.join(root, 'config', 'cookbooks.json')
 
     # => Supermarket Configuration
     define_setting :supermarkets, {}

data/lib/supermarket_sync/notifier.rb

@@ -5,7 +5,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright:: 2018, Brian Dwyer - Broadridge Financial Solutions
+# Copyright:: 2021, Brian Dwyer - Broadridge Financial Solutions
 #
 
 require 'slack-notifier'

data/lib/supermarket_sync/sync.rb

@@ -5,14 +5,14 @@
 #
 # The MIT License (MIT)
 #
-# Copyright:: 2018, Brian Dwyer - Broadridge Financial Solutions
+# Copyright:: 2021, Brian Dwyer - Broadridge Financial Solutions
 #
 
 require 'chef/http/json_input'
 require 'chef/http/json_output'
 require 'chef/http/remote_request_id'
 require 'chef/http/simple_json'
-require 'chef/cookbook_site_streaming_uploader'
+require 'chef/knife/core/cookbook_site_streaming_uploader'
 require 'mixlib/cli'
 require 'supermarket_sync/notifier'
 
@@ -67,7 +67,7 @@ module SupermarketSync
             tgz = src.streaming_request("/api/v1/cookbooks/#{cookbook}/versions/#{latest}/download")
 
             # => Upload the Cookbook
-            upload(source_meta['category'], tgz) unless Config.read_only
+            upload('other', tgz) unless Config.read_only
 
             # => Remove the Tempfile
             begin
@@ -136,7 +136,7 @@ module SupermarketSync
     private def upload(category, tarball) # rubocop: disable AbcSize, MethodLength
       uri = URI.parse(dest.url)
       uri.path = '/api/v1/cookbooks'
-      resp = Chef::CookbookSiteStreamingUploader.post(
+      resp = Chef::Knife::Core::CookbookSiteStreamingUploader.post(
         uri.to_s, Chef::Config[:node_name], Chef::Config[:client_key],
         tarball: ::File.open(tarball),
         cookbook: Chef::JSONCompat.to_json(category: category)

data/lib/supermarket_sync/util.rb

@@ -5,7 +5,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright:: 2018, Brian Dwyer - Broadridge Financial Solutions
+# Copyright:: 2021, Brian Dwyer - Broadridge Financial Solutions
 #
 
 require 'json'

data/lib/supermarket_sync/version.rb

@@ -1,3 +1,3 @@
 module SupermarketSync
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/supermarket_sync.gemspec

@@ -28,12 +28,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # => Dependencies
-  spec.add_runtime_dependency 'chef', '> 12.19.36'
-  spec.add_runtime_dependency 'slack-notifier', '~> 2.3.2'
+  spec.add_runtime_dependency 'knife', '>= 17.1', '< 18.0'
+  spec.add_runtime_dependency 'mixlib-cli', '>= 2.1.1', '< 3.0'
+  spec.add_runtime_dependency 'slack-notifier', '~> 2.4.0'
 
   # => Development Dependencies
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '= 0.55'
 end

metadata

@@ -1,71 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: supermarket_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Brian Dwyer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.19.36
+        version: '17.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 12.19.36
+        version: '18.0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +120,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.55'
-description: 
+description:
 email:
 - chef@broadridge.com
 executables:
@@ -102,6 +128,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rubocop.yml"
@@ -131,7 +158,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Utility to synchronize Chef Supermarkets
 test_files: []