chelsea 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e4509169b4bc0855e2ef590412aac149020c8506e430093285a1edc03f49652
-  data.tar.gz: 894d2636f0966c8b288e31d8f40d265b1bf156c310622fd35c90852d46c1234e
+  metadata.gz: 0f179d743f4810498f2e0edbe787038e2caed8e43af7279c39bf309860a568ae
+  data.tar.gz: b20643fbaa0bbc56073a53575b4d3d5ba2d1b4f5b8b1e996dcdc373e2a2bd997
 SHA512:
-  metadata.gz: 35e878b35f6aa92d1ae68bf4d4e18b3eedcb08de41a7fc233b42c842b3ef440c6d89f26020f86990c4af9cd52cff73e83139046eeedff82fb9fadaeac954c944
-  data.tar.gz: 946138b959b3eb119ffde5897b673002c2445549e7f48d1b0edfba50a338a8cecf14b3eb29c16ac166dfdec10a31885712563fd49a8bc01e5227a7975adc0c9b
+  metadata.gz: b44c830f8e38ba6693babade3cb1da853baf545a6839aa79bea41a5821712cf055737e8af349c1c9aa9653bb09c5faa1cad0660ec3806f0add68418dadd36f54
+  data.tar.gz: ec6ebcd7e0ac9fb7ebb30349c824187cfc06390fabd40a76a39c4c622a6801c513c5446f89dc3422f703e15cab214a3b1fb72ff7acd4f7ef6e249a27c8331b6e

data/.circleci/config.yml

@@ -35,7 +35,9 @@ jobs:
             - chelsea-bundle-v2-
       - run:
           name: Bundle Install
-          command: bundle check --path vendor/bundle || bundle install
+          command: |
+            bundle config set --local path 'vendor/bundle'
+            bundle check || bundle install
       - save_cache:
           key: chelsea-bundle-v2-{{ checksum "Gemfile.lock" }}
           paths:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chelsea (0.0.17)
+    chelsea (0.0.26)
       bundler (>= 1.2.0, < 3)
       ox (~> 2.13.2)
       pastel (~> 0.7.2)
@@ -31,7 +31,7 @@ GEM
     mime-types-data (3.2020.0512)
     necromancer (0.6.0)
     netrc (0.11.0)
-    ox (2.13.2)
+    ox (2.13.4)
     pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
@@ -57,16 +57,16 @@ GEM
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     safe_yaml (1.0.5)
-    slop (4.8.1)
+    slop (4.8.2)
     strings (0.1.8)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    tty-color (0.5.1)
+    tty-color (0.5.2)
     tty-cursor (0.7.1)
     tty-font (0.5.0)
-    tty-screen (0.8.0)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-table (0.11.0)

data/README.md

@@ -167,7 +167,13 @@ Run tests:
 bundle exec rspec
 ```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To manually release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+### Release Process
+
+Chelsea is automatically released after a commit to the `master` branch.
+
+To avoid performing a release after a commit to the `master` branch, be sure your commit message includes `[skip ci] `.
 
 ## Why Chelsea?
 

data/chelsea.gemspec

@@ -38,5 +38,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
   spec.add_development_dependency "webmock", "~> 3.8.3"
   spec.add_development_dependency "byebug", "~> 11.1.2"
-  spec.add_development_dependency 'pry'
 end

data/lib/chelsea/cli.rb

@@ -39,15 +39,19 @@ module Chelsea
         _set_config # move to init
       elsif @opts.clear?
         require_relative 'db'
-        Chelsea::DB.new().clear_cache
+        Chelsea::DB.new.clear_cache
         puts "OSS Index cache cleared"
       elsif @opts.file? && @opts.iq?
         dependencies = _process_file_iq
         _submit_sbom(dependencies)
+      elsif !@opts.file? && @opts.iq?
+        abort "Missing the --file argument. It is required with the --iq argument."
       elsif @opts.file?
         _process_file
       elsif @opts.help? # quit on opts.help earlier
         puts _cli_flags # this doesn't exist
+      else
+        abort "Missing arguments! Chelsea did nothing. Try providing the --file <Gemfile.lock> argument."
       end
     end
 
@@ -73,7 +77,26 @@ module Chelsea
       
       return unless status_url
 
-      iq.poll_status(status_url)
+      msg, color, exit_code = iq.poll_status(status_url)
+      show_status(msg, color)
+      # this may not be very ruby-esque, but `return exit_code` and `exit_code` didn't result in the desired exit status
+      exit exit_code
+    end
+
+    def show_status(msg, color)
+      case color
+      when Chelsea::IQClient::COLOR_FAILURE
+        puts @pastel.red.bold(msg)
+      when Chelsea::IQClient::COLOR_WARNING
+        # want yellow, but that doesn't print
+        # puts @pastel.color.bold(msg, color)
+        puts @pastel.blue.blue(msg)
+      when Chelsea::IQClient::COLOR_NONE
+        # want yellow, but that doesn't print
+        puts @pastel.green.bold(msg)
+      else
+        puts @pastel.bold(msg)
+      end
     end
 
     def _process_file

data/lib/chelsea/iq_client.rb

@@ -17,6 +17,7 @@
 require 'rest-client'
 require 'json'
 require 'pastel'
+require 'uri'
 
 require_relative 'spinner'
 
@@ -31,6 +32,7 @@ module Chelsea
       internal_application_id: '',
       stage: 'build'
     }
+
     def initialize(options: DEFAULT_OPTIONS)
       @options = options
       @pastel = Pastel.new
@@ -46,12 +48,12 @@ module Chelsea
         password: @options[:auth_token]
       )
       res = resource.post sbom.to_s, _headers.merge(content_type: 'application/xml')
-      unless res.code != 202
-        spin.success("...done.")
-        status_url(res)
-      else
+      if res.code != 202
         spin.stop('...request failed.')
         nil
+      else
+        spin.success("...done.")
+        status_url(res)
       end
     end
 
@@ -67,8 +69,7 @@ module Chelsea
           res = _poll_iq_server(url)
           if res.code == 200
             spin.success("...done.")
-            _handle_response(res)
-            break
+            return _handle_response(res)
           end
         rescue
           sleep(1)
@@ -76,18 +77,39 @@ module Chelsea
       end
     end
 
+    # colors to use when printing message
+    COLOR_FAILURE = 31
+    COLOR_WARNING = 33 # want yellow, but doesn't appear to print
+    COLOR_NONE = 32
+    # Known policy actions
+    POLICY_ACTION_FAILURE = 'Failure'
+    POLICY_ACTION_WARNING = 'Warning'
+    POLICY_ACTION_NONE = 'None'
+
     private
 
     def _handle_response(res)
       res = JSON.parse(res.body)
-      unless res['policyAction'] == 'Failure'
-        puts @pastel.white.bold("Hi! Chelsea here, no policy violations for this audit!")
-        puts @pastel.white.bold("Report URL: #{res['reportHtmlUrl']}")
-        exit 0
+      # get absolute report url
+      absolute_report_html_url = URI.join(@options[:server_url], res['reportHtmlUrl'])
+
+      case res['policyAction']
+      when POLICY_ACTION_FAILURE
+        return "Hi! Chelsea here, you have some policy violations to clean up!"\
+          "\nReport URL: #{absolute_report_html_url}",
+          COLOR_FAILURE, 1
+      when POLICY_ACTION_WARNING
+        return "Hi! Chelsea here, you have some policy warnings to peck at!"\
+        "\nReport URL: #{absolute_report_html_url}",
+          COLOR_WARNING, 0
+      when POLICY_ACTION_NONE
+        return "Hi! Chelsea here, no policy violations for this audit!"\
+        "\nReport URL: #{absolute_report_html_url}",
+          COLOR_NONE, 0
       else
-        puts @pastel.red.bold("Hi! Chelsea here, you have some policy violations to clean up!")
-        puts @pastel.red.bold("Report URL: #{res['reportHtmlUrl']}")
-        exit 1
+        return "Hi! Chelsea here, no policy violations for this audit, but unknown policy action!"\
+        "\nReport URL: #{absolute_report_html_url}",
+          COLOR_FAILURE, 1
       end
     end
 
@@ -141,7 +163,15 @@ module Chelsea
         password: @options[:auth_token]
       )
       res = resource.get _headers
+      if res.code != 200
+        puts "failed to get internal application id for IQ application id: #{@options[:public_application_id]}. response status: #{res.code}"
+        return
+      end
       body = JSON.parse(res)
+      if body['applications'].empty?
+        puts "failed to get internal application id for IQ application id: #{@options[:public_application_id]}"
+        return
+      end
       body['applications'][0]['id']
     end
 

data/lib/chelsea/spinner.rb

@@ -19,7 +19,7 @@ require 'pastel'
 
 module Chelsea
   class Spinner
-    def initialize()
+    def initialize
       @pastel = Pastel.new
     end
 

data/lib/chelsea/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Chelsea
-  VERSION = '0.0.26'.freeze
+  VERSION = '0.0.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chelsea
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Allister Beharry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-font
@@ -198,20 +198,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 11.1.2
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - allister.beharry@gmail.com