license_scout 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 07f7bba2a32cc6e4697c45e42c401b7298e13a473e27e91ad42eaed08d2e8bee
4
- data.tar.gz: 59c5fa80345ad053a54061901e8f6eb25458858ff0c4f4224110c43b9ba5f819
3
+ metadata.gz: 4b3570e2546cf8b7270601ba98e7918176fa39fab4cfe64ffe1f7dbd05f5059a
4
+ data.tar.gz: d40684bd6b3596d012c6d7e127187f04a963758d406825203902189ad8abe815
5
5
  SHA512:
6
- metadata.gz: 4ca283049b83fa99b661622cedb194d805eb11119f2fe96e10a260a2dd638d20b103cb1186c5ca0d4721a1f29b952933abe9aa64ab123e45e66af633a437a6b6
7
- data.tar.gz: e720c9970dfab3978c02be6dc85d9fb2f204c4c05553341e3a361515f4bfaab7f5159cb8cb493f7b9c019e84a266b78c31fdf9aae19e0e6afb46abef7ba97fc8
6
+ metadata.gz: e9f1d919eb0f5f5195f13b4aebcc52f3cf346c9e4472f4bc02fa6e25556cc419584554526a647eb3a2d456c475c2cce9f8a95b5b4d4b8d33b5a3f31bea15e77b
7
+ data.tar.gz: fd6e227a8eccbdc3f65577b844dff91572a9fa2b3d7d21c1c1390efba1326eb3e6f4c6487088df703dc748d5205afe7c9cb8ebc0040b040c16bc172685d03950
@@ -1,3 +1,4 @@
1
+ #!/usr/bin/env ruby
1
2
  #
2
3
  # Copyright:: Copyright 2016, Chef Software Inc.
3
4
  # License:: Apache License, Version 2.0
@@ -64,10 +64,8 @@ module LicenseScout
64
64
 
65
65
  LicenseScout::Config.merge!(config)
66
66
 
67
+ Mixlib::Log::Formatter.show_time = false
67
68
  LicenseScout::Log.level = LicenseScout::Config.log_level
68
- LicenseScout::Log.formatter = proc do |sev, datetime, progname, msg|
69
- "#{sev.ljust(5)} #{msg}\n"
70
- end
71
69
 
72
70
  LicenseScout::Config.config_files.each do |config_file|
73
71
  if config_file =~ /^http/
@@ -82,8 +80,13 @@ module LicenseScout
82
80
  end
83
81
  else
84
82
  full_config_file = File.expand_path(config_file)
85
- LicenseScout::Log.info("[cli] Loading config from #{full_config_file}")
86
- LicenseScout::Config.from_file(full_config_file)
83
+
84
+ if File.exist?(full_config_file)
85
+ LicenseScout::Log.info("[cli] Loading config from #{full_config_file}")
86
+ LicenseScout::Config.from_file(full_config_file)
87
+ else
88
+ LicenseScout::Log.info("[cli] Could not find file #{full_config_file} -- skipping")
89
+ end
87
90
  end
88
91
  end
89
92
 
@@ -81,11 +81,11 @@ module LicenseScout
81
81
  private
82
82
 
83
83
  def dependency_data
84
- bundler_script = File.join(File.dirname(__FILE__), "bundler/_bundler_script.rb")
84
+ gemfile_to_json_path = File.expand_path("../../../bin/gemfile_json", File.dirname(__FILE__))
85
85
 
86
86
  Dir.chdir(directory) do
87
87
  json_dep_data = with_clean_env do
88
- s = Mixlib::ShellOut.new("#{LicenseScout::Config.ruby_bin} #{bundler_script}", environment: LicenseScout::Config.environment)
88
+ s = Mixlib::ShellOut.new("#{LicenseScout::Config.ruby_bin} #{gemfile_to_json_path}", environment: LicenseScout::Config.environment)
89
89
  s.run_command
90
90
  s.error!
91
91
  s.stdout
@@ -16,5 +16,5 @@
16
16
  #
17
17
 
18
18
  module LicenseScout
19
- VERSION = "2.0.3"
19
+ VERSION = "2.0.4"
20
20
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: license_scout
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Serdar Sutay
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-04-17 00:00:00.000000000 Z
12
+ date: 2018-04-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ffi-yajl
@@ -274,6 +274,7 @@ extra_rdoc_files: []
274
274
  files:
275
275
  - LICENSE
276
276
  - README.md
277
+ - bin/gemfile_json
277
278
  - bin/license_scout
278
279
  - bin/mix_lock_json
279
280
  - bin/rebar_lock_json
@@ -289,7 +290,6 @@ files:
289
290
  - lib/license_scout/dependency_manager/base.rb
290
291
  - lib/license_scout/dependency_manager/berkshelf.rb
291
292
  - lib/license_scout/dependency_manager/bundler.rb
292
- - lib/license_scout/dependency_manager/bundler/_bundler_script.rb
293
293
  - lib/license_scout/dependency_manager/cpanm.rb
294
294
  - lib/license_scout/dependency_manager/dep.rb
295
295
  - lib/license_scout/dependency_manager/glide.rb