derelict 0.2.1.travis.79 → 0.2.1.travis.81

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmExNDJjMGEzMGZjYTczYjY1ODkyZjMxOTFkNDdmNTNjMDM3YTNiZg==
+    MjIxYjFmNGVlMTc1NzJjZjhjODhkNWQzODdkYjNhNTdkODM3YWExNw==
   data.tar.gz: !binary |-
-    NTMwZmUyMzBhYmMwNWM1ODAxYTUxOGVmMWYzNGY3NGEyMmEwZmY5ZA==
+    NTZkZTQyYjBlMmMyZDViNTI3MDRhZGYzZTY3MTdhYzdiYjIwOTliZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2Y5MDcwYjI3YWQ0OWRiNjhmMGI0MTI0MTlkNWE2MDRlOTg2NTJlN2JmNTQw
-    ZWExY2YxNWMxYThhNjdlOTNkZjljZWE4ZjIxYTllMjE2MTEyOWQ2NWRjNTEx
-    ZmM1MmRjOGNiYmE1MWI1NTVkYzIzMmViN2QxOWY3ZjBjMDYwZDU=
+    MjQwYThhZTFkYjQwODk3NTBlZmI5OWM4ODNiNTEyNTMzZTExNDVmMTA3ODRm
+    Y2FkYWY3YzIxMjczMmIyNWEzZDI3ZmQxYWU4ZjM0NGEzNTJjNGZhYjliZjgw
+    ZDVmMmZmZGMyYjQ4NzEzNmVjNjQzMjlhZTdmZTE5YjQ5MWUxMTE=
   data.tar.gz: !binary |-
-    MmY2MjkwM2VjOGUwYWMzNjA1MTE2NzU5NTQzYWMyMTUyZmIzMGZhMmU2YmM1
-    Njc0N2JlZWEwMWNiNDc5MWNjMTExMmI3NTA5YjFmNzU1Y2FmMzdhZDQ0Mzlk
-    ZTgxMTZmNzdiZjdiNTUxZTUzZTdhZmM2M2MxNzBjOGYzZjg3NTk=
+    YmI3NmFiNDBiYzNlOGI1NjI1ODIyZmRkYTU3NjlmNDg5ZGEwNzIxZTE1MzBi
+    YTk3NGViMjkzN2JlYThiOTk2ZTgxZjFlYjZmM2M4MzBlMDIyZDcxZjY4ZjIx
+    ZjFiMjcyNDU4MjEwODlkMDA2ZDQ2ZjZmNzczY2JjNDFmYzFhMTM=

data/lib/derelict/plugin/manager.rb

@@ -30,8 +30,8 @@ module Derelict
       # Determines whether a particular plugin is installed
       #
       #   * plugin_name: Name of the plugin to look for (as a string)
-      def installed?(plugin_name)
-        fetch plugin_name; true
+      def installed?(plugin_name, version = nil)
+        fetch(plugin_name).version == version or version.nil?
       rescue Plugin::NotFound
         false
       end
@@ -56,7 +56,9 @@ module Derelict
         command.concat ["--plugin-version", version] unless version.nil?
 
         log_block = options[:log] ? shell_log_block : nil
-        instance.execute! *command, &log_block
+        instance.execute!(*command, &log_block).tap do
+          flush_cache # flush memoized method return values
+        end
       end
 
       # Uninstalls a particular Vagrant plugin
@@ -67,7 +69,9 @@ module Derelict
         logger.info "Uninstalling plugin '#{plugin_name}' using #{description}"
 
         log_block = options[:log] ? shell_log_block : nil
-        instance.execute! :plugin, "uninstall", plugin_name, &log_block
+        instance.execute!(:plugin, "uninstall", plugin_name, &log_block).tap do
+          flush_cache # flush memoized method return values
+        end
       end
 
       # Updates a particular Vagrant plugin
@@ -78,7 +82,9 @@ module Derelict
         logger.info "Updating plugin '#{plugin_name}' using #{description}"
 
         log_block = options[:log] ? shell_log_block : nil
-        instance.execute! :plugin, "update", plugin_name, &log_block
+        instance.execute!(:plugin, "update", plugin_name, &log_block).tap do
+          flush_cache # flush memoized method return values
+        end
       end
 
       # Retrieves a plugin with a particular name

data/spec/derelict/plugin/manager_spec.rb

@@ -38,17 +38,42 @@ describe Derelict::Plugin::Manager do
 
   describe "#installed?" do
     let(:plugin_name) { double("plugin_name") }
-    let(:result) { double("result") }
-    subject { manager.installed? plugin_name }
+    let(:plugin) { double("plugin", :version => plugin_version) }
+    let(:plugin_version) { nil }
+    let(:version) { nil }
+    subject { manager.installed? plugin_name, version }
 
     context "with known plugin" do
-      before { expect(manager).to receive(:fetch).with(plugin_name).and_return(result) }
-      it { should be true }
+      before { expect(manager).to receive(:fetch).with(plugin_name).and_return(plugin) }
+
+      context "with version" do
+        let(:version) { "1.2.3" }
+        let(:plugin_version) { "1.2.3" }
+        it { should be true }
+      end
+
+      context "with wrong version" do
+        let(:version) { "1.2.3" }
+        let(:plugin_version) { "2.3.4" }
+        it { should be false }
+      end
+
+      context "without version" do
+        it { should be true }
+      end
     end
 
     context "with unknown plugin" do
       before { expect(manager).to receive(:fetch).with(plugin_name).and_raise(Derelict::Plugin::NotFound.new plugin_name) }
-      it { should be false }
+
+      context "with version" do
+        let(:version) { "3.4.5" }
+        it { should be false }
+      end
+
+      context "without version" do
+        it { should be false }
+      end
     end
 
     include_context "logged messages"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: derelict
 version: !ruby/object:Gem::Version
-  version: 0.2.1.travis.79
+  version: 0.2.1.travis.81
 platform: ruby
 authors:
 - Brad Feehan