mrjoy-bundler-audit 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b9ab49f8c28f5409240c762d440a51472ed981
-  data.tar.gz: e9befa665dd527051744e7edd7706cbece60d636
+  metadata.gz: 3960f49194360e5a5f36eec308bab61e5345e3bc
+  data.tar.gz: 65196e264e5b6d57fa4b614aabe3186bc21b3fdf
 SHA512:
-  metadata.gz: d64dfbf30d2801b6c89be762b840cd9b676a26355883dc3eab09ed6b4d2721e0184457c8372407f50b4962b4f488690fe49d7a558fd6a8acb24e1ea8f5b7dd2f
-  data.tar.gz: c090e2cc9dc19c62564aa3d56a3aa2a7cac6a6606dca9440bfcef2b1f12a0d2507a5051b911382e31022ffc19ccaa2e69def3bf9223222717fdc3e2cebfee0c8
+  metadata.gz: 234b6d8519148b7678e6054f254a0424ad5e8afdb1692a30960f69da57fcbe336db9a1a7ad6466e4660d0498fd1ae74749188241897d0d58e7f40f447f78c270
+  data.tar.gz: 54ee313243314ce7605c7d794d955adbadb694288308248faaa1d8d5e7fb8a44b2b690a3d73430644bc3a0f3351ccf51fc7fadd742e23f72979d07fe022e367a

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### mrjoy-0.3.5 / 2014-04-16
+
+* Improve user experience when no vulnerability DB has been downloaded.
+* Slight improvement to code coverage.
+
 ### mrjoy-0.3.4 / 2014-04-16
 
 * Integrate upstream changes from `gut_vendored_db`.  This eliminates the

data/lib/bundler/audit/cli.rb

@@ -36,7 +36,12 @@ module Bundler
       method_option :ignore, :type => :array, :aliases => '-i'
 
       def check
-        scanner    = Scanner.new
+        begin
+          scanner  = Scanner.new
+        rescue ArgumentError
+          print_setup_instructions
+          exit 1
+        end
         vulnerable = false
 
         # attempt update the database before doing a scan
@@ -71,9 +76,20 @@ module Bundler
 
       desc 'version', 'Prints the bundler-audit version'
       def version
-        database = Database.new
+        cmd = File.basename($0)
+        advisories = nil
+        begin
+          database = Database.new
+          advisories = " (advisories: #{database.size})"
+        rescue ArgumentError
+          # Don't have a database yet.
+        end
 
-        puts "#{File.basename($0)} #{VERSION} (advisories: #{database.size})"
+        say "#{cmd} #{VERSION}#{advisories}", :bold
+        if advisories.nil?
+          print_setup_instructions
+          exit 1
+        end
       end
 
       protected
@@ -106,6 +122,16 @@ module Bundler
       end
 
     protected
+
+      def print_setup_instructions
+        say ""
+        print_warning "You don't have a copy of the Ruby vulnerabilities database yet."
+        print_warning "To get the database, please run:"
+        say ""
+        print_warning "  #{$0} update"
+        say ""
+      end
+
       def print_affected_gem(gem)
         say "Name: ", :red
         say gem.name

data/lib/bundler/audit/version.rb

@@ -20,6 +20,6 @@
 module Bundler
   module Audit
     # bundler-audit version
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

data/spec/integration_spec.rb

@@ -60,6 +60,27 @@ Solution: upgrade to ((~>|=>) \d+.\d+.\d+, )*(~>|=>) \d+.\d+.\d+[\s\n]*?)+/
     end
   end
 
+  context "when displaying bundler-audit version" do
+    let(:bundle)    { 'unpatched_gems' }
+    let(:directory) { File.join('spec','bundle',bundle) }
+
+    let(:command) do
+      File.expand_path('../bundle/wrapper.rb', __FILE__) + " version"
+    end
+
+    subject do
+      # Ignoring failure here as bundle-audit version seems to return a
+      # non-zero status, and
+      Dir.chdir(directory) { sh(command, :fail => false) }
+    end
+
+    it "should show the version and number of known advisories" do
+      # It prints a name based on $0, so our wrapper mucks up the display in a
+      # predictable way.
+      subject.should match(/^wrapper\.rb #{Regexp.quote('0.3.4')} \(advisories: \d+\)/)
+    end
+  end
+
   context "when auditing a bundle with ignored gems" do
     let(:bundle)    { 'unpatched_gems' }
     let(:directory) { File.join('spec','bundle',bundle) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrjoy-bundler-audit
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Postmodern