license-acceptance 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee66c4765774b7f57b1ee20c55138e11bd72071d09cdd1d18fdce1f4888529f
-  data.tar.gz: 765218350bff46b378b62a103e28f6108f0bf105ed94695b1c51141cfa9e48b4
+  metadata.gz: 3857d587ba94db88839300fd30d69123c5adfbf38d1dff100df967d8da698ef5
+  data.tar.gz: 24b7cf0a941fed9968c631c5b868c9e31b26a5ce10c0cf8fdb6ec69d105721f1
 SHA512:
-  metadata.gz: 607159212194ba650b7c6a5661f7706977dd376192765da07c62d4ef54fcbbe0cfc7a6ed80d7520a1c5c5c97c7a8cdc986d53730deef6b9dd391ae26c7329065
-  data.tar.gz: 5a45bb60c410d73a286efa1a9c812f977ecc49c1070ac8705c4568f6f4f4ca073127ec6dc4115d108f9996665a309ec30328f9d9b2f461a91d4b36e95133fea2
+  metadata.gz: 5a56db6f2962c22c1338521ac254ed7d89862089b8c7a5263a061bf0b4a47a652a8e08332243df50b9c6c1e3cfb589f0ccd49d6a4e7f61143bd31fe45a00e868
+  data.tar.gz: c97e284c30fc2d122612a9b7f66220dbba82d6aca37689969d4fdc3aa2c58eced2fc8b61ad0fc17409354de80bfeeb0811db03af568840b5663b7e0a8a957cb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-acceptance (1.0.0)
+    license-acceptance (1.0.2)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)

data/lib/license_acceptance/acceptor.rb

@@ -103,7 +103,8 @@ module LicenseAcceptance
     def license_required?(mixlib_name, version)
       product = product_reader.lookup_by_mixlib(mixlib_name)
       return false if product.nil?
-      return true if version == :latest
+      # If they don't pass a version we assume they want latest
+      return true if version == :latest || version.nil?
       Gem::Version.new(version) >= Gem::Version.new(product.license_required_version)
     end
 

data/lib/license_acceptance/version.rb

@@ -1,3 +1,3 @@
 module LicenseAcceptance
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/spec/license_acceptance/acceptor_spec.rb

@@ -235,6 +235,54 @@ RSpec.describe LicenseAcceptance::Acceptor do
         expect(acc.acceptance_value).to eq(nil)
       end
     end
+  end
+
+  describe "#license_required?" do
+    let(:reader) { instance_double(LicenseAcceptance::ProductReader) }
+    let(:mixlib_name) { "chef" }
+    let(:version) { "15.0.0" }
+    let(:product) { instance_double(LicenseAcceptance::Product, name: "chef-infra", license_required_version: "15.0.0") }
+
+    before do
+      expect(LicenseAcceptance::ProductReader).to receive(:new).and_return(reader)
+      expect(reader).to receive(:read)
+    end
+
+    it "returns false if no product can be found" do
+      expect(reader).to receive(:lookup_by_mixlib).with(mixlib_name).and_return nil
+      expect(acc.license_required?(mixlib_name, version)).to eq(false)
+    end
+
+    describe "when version is :latest" do
+      let(:version) { :latest }
+      it "returns true" do
+        expect(reader).to receive(:lookup_by_mixlib).with(mixlib_name).and_return product
+        expect(acc.license_required?(mixlib_name, version)).to eq(true)
+      end
+    end
+
+    describe "when version is nil" do
+      let(:version) { nil }
+      it "returns true" do
+        expect(reader).to receive(:lookup_by_mixlib).with(mixlib_name).and_return product
+        expect(acc.license_required?(mixlib_name, version)).to eq(true)
+      end
+    end
 
+    describe "when version is >= than required version" do
+      let(:version) { "15.0.0" }
+      it "returns true" do
+        expect(reader).to receive(:lookup_by_mixlib).with(mixlib_name).and_return product
+        expect(acc.license_required?(mixlib_name, version)).to eq(true)
+      end
+    end
+
+    describe "when version is < required version" do
+      let(:version) { "14.99.99" }
+      it "returns false" do
+        expect(reader).to receive(:lookup_by_mixlib).with(mixlib_name).and_return product
+        expect(acc.license_required?(mixlib_name, version)).to eq(false)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: license-acceptance
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - tyler-ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel