deriving_license 0.1.3 → 0.1.4

data/Gemfile

@@ -2,4 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake", ">= 0.8.7"
+gem "rake", ">= 0.8.7"
+gem "safe_yaml"

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    deriving_license (0.1.2)
+    deriving_license (0.1.3)
       gemnasium-parser
+      safe_yaml
 
 GEM
   remote: https://rubygems.org/
   specs:
     gemnasium-parser (0.1.9)
     rake (10.0.4)
+    safe_yaml (0.9.1)
 
 PLATFORMS
   ruby
@@ -16,3 +18,4 @@ PLATFORMS
 DEPENDENCIES
   deriving_license!
   rake (>= 0.8.7)
+  safe_yaml

data/deriving_license.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'deriving_license'
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.summary     = "Deriving Licence finds the license agreements for all gems in your Gemfile"
   s.description = "Deriving Licence finds the license agreements for all gems in your Gemfile if included in your project, or in a Gemfile passed to the included binary"
   s.authors     = ["Tom Allen"]
@@ -12,5 +12,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(/^test\//)
   
-  s.add_dependency "gemnasium-parser"
+  s.add_runtime_dependency "gemnasium-parser"
+  s.add_runtime_dependency "safe_yaml"
 end

data/lib/deriving_license.rb

@@ -1,5 +1,6 @@
 require "gemnasium/parser"
 require "bundler"
+require "safe_yaml"
 
 class DerivingLicense
   
@@ -43,10 +44,11 @@ class DerivingLicense
       Bundler.with_clean_env do # This gets out of the bundler context.
         remote = /#{d.name}/.match( `BUNDLE_GEMFILE=#{path}; gem list #{d.name}` ) ? "" : "-r "      
         print "Determining license for #{d.name}#{remote.empty? ? "" : " (remote call required)"}..."
-        @spec = eval `gem specification #{remote}#{d.name} --ruby`
+        yaml = `gem specification #{remote}#{d.name} --yaml`
+        @spec = YAML.load(yaml, :safe => true)
       end
-      print "#{@spec.licenses.empty? ? "UNKNOWN" : "SUCCESS"}\n"
-      @spec.licenses.each{ |l| licenses[l]+=1 }
+      print "#{@spec["licenses"].empty? ? "UNKNOWN" : "SUCCESS"}\n"
+      @spec["licenses"].each{ |l| licenses[l]+=1 }
     end
     licenses
   end

data/test/test_deriving_license.rb

@@ -30,7 +30,7 @@ class DerivingLicenseTest < Test::Unit::TestCase
     assert_nothing_raised do
       DerivingLicense.run("Gemfile")
     end
-    assert_equal( {"MIT"=>1}, DerivingLicense.run("Gemfile") )
+    assert_equal( {"MIT"=>2}, DerivingLicense.run("Gemfile") )
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deriving_license
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deriving Licence finds the license agreements for all gems in your Gemfile
   if included in your project, or in a Gemfile passed to the included binary
 email: tom@jugglethis.net