npmdc 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7eada3811dc31b5a240495eba981289843e70a7
-  data.tar.gz: e4c1bf4e93e6d0b56682a4403c1aee1b7c7fa412
+  metadata.gz: c1fd0abf8808ba29b1d65b59667cd47319ce76e6
+  data.tar.gz: d5d195c20a74dc5e8536de5d0519cd7bf32092d7
 SHA512:
-  metadata.gz: 7ec1aad5bcae24fbd540061ac20caa085e3e69c04e045bac1352d53b1d3e2921135187ab747f47f395c15dd19c883c1c08d3a3c730d8888f8a1e1fc43b7965f3
-  data.tar.gz: 277912a03de5824c67f3a857408aaa9c55d7943e210ee0a8d210216115e3c549f76f12df517bfa4a3266747a2b6fbe4cc1896dbaf5f7641f83b97326cba06062
+  metadata.gz: 9c94b169047a5d883c55d58c6894a1f33cd82110304d09a9346958e51e9a161086c0d82eaa42178615c97373c0da7ed9237ed6116975b68444a9c2f2401520f2
+  data.tar.gz: 89e042a0604efa0c992b9eb31a7b6c0e7c619c6f1d7c253d840aced2be3c2cfbf7e6ee363ff02cecd3395a80606d0fed7c47c75dede087c8d039fc954e1d5484

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.0 First release
+### 0.1.0
 
 Initial implementation of Npmdc gem with following features:
 
@@ -9,7 +9,7 @@ Initial implementation of Npmdc gem with following features:
 * Standalone CLI tool
 
 
-### 0.1.1 Compatibility improvemnts
+### 0.1.1
 
 * Now works with Ruby >= 2.2.0
 
@@ -43,15 +43,22 @@ Thanks to @aderyabin !
 
 ### 0.2.2
 
-Thanks to @palkan !
-
 * Fixed runtime dependencies
 
 
 ### 0.2.3
 
+Thanks to @palkan !
+
 * Improved Rails integration
 
 * Add Rails integration specs
 
 * Minor improvemnts
+
+
+### 0.2.4
+
+* Fixed Rails integration
+
+* Fixed options handling from config

data/README.md

@@ -34,12 +34,9 @@ Or install it yourself as:
 
 ```ruby
 YourApp::Application.configure do
-  config.npmdc = {
-    :path => "/path/to/your/frontend/code/dir" # `Rails.root` by default,
-    :verbose => true                           # `false` by default
-    :'no-color' => true                        # `false` by default
-    :format => "doc"                           # `short`, `doc`, `progress`. `short` 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
 end
 ```
 
@@ -54,11 +51,9 @@ _Options:_
 
 * --path PATH - Path to frontend code
 
-* -V, --verbose - Set the verbose level of output
+* --color - Disable color formatting of output
 
-* --no-color - Disable color formatting of output
-
-* --format FORMAT - Set format of output
+* -f, --format FORMAT - Set format of output
 
 
 ## Development

data/bin/npmdc

@@ -3,4 +3,5 @@
 require 'bundler/setup'
 require 'npmdc/cli'
 
-Npmdc::Cli.start(ARGV)
+result = Npmdc::Cli.start(ARGV)
+exit(result ? 0 : 1)

data/lib/npmdc/checker.rb

@@ -14,7 +14,7 @@ module Npmdc
     DEPENDENCIES = %w(dependencies devDependencies).freeze
 
     def initialize(options)
-      @path = options[:path] || Dir.pwd
+      @path = options.fetch('path', Npmdc.config.path)
       @formatter = Npmdc::Formatter.(options)
       @dependencies_count = 0
       @missing_dependencies = Set.new

data/lib/npmdc/cli.rb

@@ -8,7 +8,9 @@ module Npmdc
     desc 'check', 'Run check'
     method_option :path, desc: 'Path to package.json config'
     method_option :color, desc: 'Enable color', type: :boolean, default: true
-    method_option :format, desc: "Output format, possible values: #{Npmdc::Formatter::FORMATTERS.keys.join(", ")}"
+    method_option :format, aliases: [:f],
+                           desc: "Output format,
+                           possible values: #{Npmdc::Formatter::FORMATTERS.keys.join(", ")}"
 
     def check
       Npmdc.call(options)

data/lib/npmdc/config.rb

@@ -0,0 +1,20 @@
+module Npmdc
+  class Config
+    attr_accessor :color, :format, :output
+    attr_writer :path
+
+    def initialize
+      @color = true
+      @format = :short
+      @output = STDOUT
+    end
+
+    def path
+      @path ||= Dir.pwd
+    end
+
+    def path?
+      instance_variable_defined?(:@path)
+    end
+  end
+end

data/lib/npmdc/engine.rb

@@ -2,12 +2,12 @@ require 'npmdc'
 
 module Npmdc
   class Engine < Rails::Engine # :nodoc:
-    config.npmdc = ActiveSupport::OrderedOptions.new
+    # Make config accessible through application config
+    config.npmdc = Npmdc.config
 
-    initializer "npmdc.load_hook" do |app|
-      options = app.config.npmdc
-      options.path ||= Rails.root
-      Npmdc.call(options)
+    initializer "npmdc.load_hook" do |_app|
+      Npmdc.config.path = Rails.root unless Npmdc.config.path?
+      Npmdc.call
     end
   end
 end

data/lib/npmdc/formatter.rb

@@ -11,11 +11,9 @@ module Npmdc
       short:    Npmdc::Formatters::Short
     }.freeze
 
-    DEFAULT_FORMAT = :short
-
     class << self
       def call(options)
-        fmt = options.fetch(:format, DEFAULT_FORMAT)
+        fmt = options.fetch('format', Npmdc.config.format)
         FORMATTERS[fmt.to_sym].new(options)
       end
     end

data/lib/npmdc/formatters/base.rb

@@ -11,10 +11,10 @@ module Npmdc
         info: :white
       }.freeze
 
-      def initialize(options, output = Npmdc.output)
+      def initialize(options, output = Npmdc.config.output)
         @options = options
         @output = output
-        @disable_colorization = !@options.fetch(:color, true)
+        @disable_colorization = !@options.fetch('color', Npmdc.config.color)
       end
 
       def output(message, status = nil)

data/lib/npmdc/version.rb

@@ -1,3 +1,3 @@
 module Npmdc
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/npmdc.rb

@@ -1,17 +1,21 @@
-require "npmdc/checker"
-require "npmdc/engine" if defined?(Rails)
-require "npmdc/version"
-
 module Npmdc
-  class << self
-    attr_writer :output
+  require "npmdc/config"
+  require "npmdc/checker"
+  require "npmdc/version"
 
+  class << self
     def call(options = {})
       Npmdc::Checker.new(options).call
     end
 
-    def output
-      @output ||= STDOUT
+    def config
+      @config ||= Config.new
+    end
+
+    def configure
+      yield config
     end
   end
+
+  require "npmdc/engine" if defined?(Rails)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: npmdc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Emil Kashkevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,7 @@ files:
 - lib/npmdc.rb
 - lib/npmdc/checker.rb
 - lib/npmdc/cli.rb
+- lib/npmdc/config.rb
 - lib/npmdc/engine.rb
 - lib/npmdc/errors.rb
 - lib/npmdc/formatter.rb
@@ -144,7 +145,6 @@ files:
 - lib/npmdc/formatters/progress.rb
 - lib/npmdc/formatters/short.rb
 - lib/npmdc/version.rb
-- log/test.log
 - npmdc.gemspec
 homepage: https://github.com/lysyi3m/npmdc
 licenses: