npmdc 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a56c417f7018f76df103bb2e55ffdf8a336a95e
-  data.tar.gz: 113c029da152241b908c6f6cdc19fd860871ec1f
+  metadata.gz: 112fb0c5efc03f50a0870591e6f3067dbe634425
+  data.tar.gz: d361a763ceef587dc76fe1ef4d0c15d044e400b0
 SHA512:
-  metadata.gz: 7b801894de357bbcdc00431b9c83530d6b9f6087feddd1db8da84a1b0d0d03ccc4d35f66f8bc61cfbb8361882e381b5ccdd89091111e056341b47899e72adb49
-  data.tar.gz: a10d71f989b3ace2c97bc9babba12778e3a6e174c3424d90021cfa095d8881efa6703679438cb73f356a905d5f0aab1cd3d0890664a3ce32b6a3a310620c64f4
+  metadata.gz: f381341d64a7b6742671efb6ceea4ac9ad703620dd9bdf57b51a3495d6cd299365e505f2ba14f2c5750bc09ae7c123d011305e04985ab003d525b695b9e211fa
+  data.tar.gz: c4b5f138919774d106b1d4fa897c7176933dc0446c1822111b037ade6ee534584707b9cbe03916e7054a341ebe3681b9d62a626b744225235eed6a0c415fc5c3

data/CHANGELOG.md

@@ -92,3 +92,14 @@ Thanks to @palkan !
 Thanks to @sponomarev !
 
 * Added support for environment-based configuration
+
+
+### 0.4.0
+
+* Added support for "non-version" strings defined as packages version
+
+* Added output warnings for unprocessable cases
+
+Thanks to @sponomarev !
+
+* Added `abort_on_failure` option

data/README.md

@@ -37,11 +37,12 @@ Or install it yourself as:
 
 ```ruby
 YourApp::Application.configure do
-  config.npmdc.path          = "/path/to/your/frontend/code/dir" # `Rails.root` by default
-  config.npmdc.format        = "doc"                             # `short`, `doc`, `progress`. `short` by default
-  config.npmdc.color         = false                             # `true` by default
-  config.npmdc.types         = ["dependencies"]                  # `["dependencies", "devDependencies"]` by default
-  config.npmdc.environments  = ["development"]                   # `development` only by default
+  config.npmdc.path             = "/path/to/your/frontend/code/dir" # `Rails.root` by default
+  config.npmdc.format           = "doc"                             # `short`, `doc`, `progress`. `short` by default
+  config.npmdc.color            = false                             # `true` by default
+  config.npmdc.types            = ["dependencies"]                  # `["dependencies", "devDependencies"]` by default
+  config.npmdc.environments     = ["development"]                   # `development` only by default
+  config.npmdc.abort_on_failure = true                              # 'false' by default
 end
 ```
 

data/lib/npmdc/checker.rb

@@ -15,9 +15,11 @@ module Npmdc
     def initialize(options)
       @path = options.fetch('path', Npmdc.config.path)
       @types = options.fetch('types', Npmdc.config.types)
+      @abort_on_failure = options.fetch('abort_on_failure', Npmdc.config.abort_on_failure)
       @formatter = Npmdc::Formatter.(options)
       @dependencies_count = 0
       @missing_dependencies = Set.new
+      @suspicious_dependencies = Set.new
     end
 
     delegate [
@@ -26,30 +28,29 @@ module Npmdc
     ] => :formatter
 
     def call
-      begin
-        success = false
-        package_json_data = package_json(path)
-        @types.each do |dep|
-          check_dependencies(package_json_data[dep], dep) if package_json_data[dep]
-        end
+      package_json_data = package_json(path)
+      @types.each do |dep|
+        check_dependencies(package_json_data[dep], dep) if package_json_data[dep]
+      end
 
-      rescue CheckerError => e
-        error_output(e)
-      else
-        success = true unless !@missing_dependencies.empty?
-      ensure
-        if !@missing_dependencies.empty?
-          output("Following dependencies required by your package.json file are missing or not installed properly:")
-          @missing_dependencies.each do |dep|
-            output("  * #{dep}")
-          end
-          output("\nRun `npm install` to install #{@missing_dependencies.size} missing packages.", :warn)
-        elsif success
-          output("Checked #{@dependencies_count} packages. Everything is ok.", :success)
-        end
+      if !@missing_dependencies.empty?
+        raise(MissedDependencyError, dependencies: @missing_dependencies)
       end
 
-      success
+      result_stats = "Checked #{@dependencies_count} packages. " +
+                     "Warnings: #{@suspicious_dependencies.count}. " +
+                     "Errors: #{@missing_dependencies.count}. " +
+                     "Everything is ok."
+
+      output(result_stats, :success)
+
+      true
+    rescue CheckerError => e
+      error_output(e)
+
+      exit(1) if @abort_on_failure && e.class.critical?
+
+      false
     end
 
     private
@@ -84,7 +85,13 @@ module Npmdc
 
       deps.each_key do |dep|
         @dependencies_count += 1
-        check_dependency(dep, deps[dep])
+
+        if SemanticRange.valid_range(deps[dep])
+          check_dependency(dep, deps[dep])
+        else
+          @suspicious_dependencies << "#{dep}@#{deps[dep]}"
+          dep_output("npmdc cannot check package '#{dep}' (#{deps[dep]})", :warn)
+        end
       end
 
       check_finish_output

data/lib/npmdc/config.rb

@@ -3,7 +3,8 @@ module Npmdc
     DEPEPENDENCY_TYPES = %w(dependencies devDependencies).freeze
     ENVIRONMENTS = %w(development).freeze
 
-    attr_accessor :color, :format, :output, :types, :environments
+    attr_accessor :color, :format, :output, :types, :environments,
+                  :abort_on_failure
     attr_writer :path
 
     def initialize
@@ -12,6 +13,7 @@ module Npmdc
       @output = STDOUT
       @types = DEPEPENDENCY_TYPES
       @environments = ENVIRONMENTS
+      @abort_on_failure = false
     end
 
     def path

data/lib/npmdc/errors.rb

@@ -14,10 +14,27 @@ module Npmdc
       end
     end
 
-    class CheckerError < Error; end
     class ConfigurationError < Error; end
 
+    class CheckerError < Error
+        @critical = false
+
+        class << self
+          def critical?
+            @critical
+          end
+
+          private
+
+          def define_critical!
+            @critical = true
+          end
+        end
+    end
+
     class NoNodeModulesError < CheckerError
+      define_critical!
+
       def banner
         path = options.fetch(:path)
         [
@@ -28,6 +45,8 @@ module Npmdc
     end
 
     class WrongPathError < CheckerError
+      define_critical!
+
       def banner
         directory = options.fetch(:directory)
         "There is no '#{directory}' directory."
@@ -42,12 +61,35 @@ module Npmdc
     end
 
     class JsonParseError < CheckerError
+      define_critical!
+
       def banner
         path = options.fetch(:path)
         "Can't parse JSON file #{path}"
       end
     end
 
+    class MissedDependencyError < CheckerError
+      define_critical!
+
+      def banner
+        deps = options.fetch(:dependencies)
+
+        [
+          "Following dependencies required by your package.json file are"\
+          " missing or not installed properly:"
+        ] + msgs(deps) <<
+        [
+          "\nRun `npm install` to install #{deps.size} missing packages.", :warn
+        ]
+      end
+
+      private
+
+      def msgs(dependencies)
+        dependencies.map { |d| "  * #{d}"}
+      end
+    end
 
     class UnknownFormatter < ConfigurationError
       def banner

data/lib/npmdc/formatters/documentation.rb

@@ -9,8 +9,10 @@ module Npmdc
           @output.puts color_message("  ✓ #{dep}", status)
         when :failure
           @output.puts color_message("  ✗ #{dep}", status)
+        when :warn
+          @output.puts color_message("  ! #{dep}", status)
         end
       end
     end
   end
-end
+end

data/lib/npmdc/formatters/progress.rb

@@ -9,6 +9,8 @@ module Npmdc
           @output.print color_message(".", status)
         when :failure
           @output.print color_message("F", status)
+        when :warn
+          @output.print color_message("W", status)
         end
       end
 
@@ -17,4 +19,4 @@ module Npmdc
       end
     end
   end
-end
+end

data/lib/npmdc/version.rb

@@ -1,3 +1,3 @@
 module Npmdc
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/npmdc.rb

@@ -8,9 +8,7 @@ module Npmdc
       Npmdc::Checker.new(options).call
 
     rescue Npmdc::Errors::ConfigurationError => e
-      Npmdc.config.output.puts e.banner
-
-      false
+      abort(e.banner)
     end
 
     def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: npmdc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Emil Kashkevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Check for missed dependencies of NPM packages.