derelict 0.6.2.travis.150 → 0.6.2.travis.152

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzExZDdjOWFlYzExYjk1OTkzMTllYmVkYzgzODc3YTBlYzI5MGIxMg==
+    NWE0ZDM5MDliYzY0Y2EzMDIxMGQzNzU5ZDBkZGExZTk4YzNjOGY3YQ==
   data.tar.gz: !binary |-
-    YTY1M2U2YmE5MWY0NWRmMTIxM2JmYjg0N2I2ZDNjNWYzY2MzYTNkMw==
+    MTQzMDUzMTE4MmQzMzVjMmJlNWE1NTQ0NjUyNWJhMTA0MWUyOTNjZA==
 SHA512:
   metadata.gz: !binary |-
-    ZGI4M2MyYTNiYzBjMzE5NDA0ZmI4NDhkNjA3YWQ5YTJjOWZkMDNiYzcxYTZl
-    NDYxMzUyMDllZWIxYmExM2M4NzBlOWQxN2E5ZTg2YmFlYzIwOGQzMzllZjRh
-    M2EyZjMxZDhjODE1ZTc5OTA2ZjVhODNkMTMzNmNiMjllM2MxMGU=
+    OTBkNDFkMzJmZWJhNTY4ZjZhMzQwMWEzMGZlMTllYTFkYzEyN2ZjZWMzOGI5
+    YTU3Zjc1MWM5M2I2MGFlNmFiZGFhOTVmNTRhYjQ5NjZlZDBlN2FiOTY1OGE4
+    M2U1OThhMmUyM2RhOWMxNWIzYjdiZGNjYjI5NmYwYzE2MjQ0NTA=
   data.tar.gz: !binary |-
-    MjIyMjYyNjA0ZmRmOTAyMzgxZjA0ODg0YmRhYWNmYjAzMzQyNjJhZGI5Yzdj
-    YjEyNTI5NTQzYzZlYzYzODlhMmVmYTFmZTllOGM3MWJlYWZmMWFkZDZkN2U0
-    N2UzOGM0YmMyYWVlOTdhZjk5NzQ1NmQ0ODRmMjZhZDYzZTQ0MDQ=
+    ODY3ZTRmMTQ5ZDQyOGJiYjlmZjljMjkzOGE0MTZiYzlkYjg0ZTJlZjIxOTRj
+    NzFmMDg4MDdmZjIyYjc1MGZmNjNjNjFhMTM1ZDRkMGZkZWUzNGE4ZGM5YjE4
+    ZWQ5YjNhMTY1YTc2MTM4OTZjNzUyMjc2ZjJiYmEwMGIwNjJjMmM=

data/lib/derelict/parser/plugin_list.rb

@@ -14,11 +14,14 @@ module Derelict
     #   1. Plugin name, as listed in the output
     #   2. Currently installed version (without surrounding brackets)
     PARSE_PLUGIN = %r[
-      ^(.*)                  # Plugin name starts at the start of the line.
-      \                      # Version is separated by a space character,
-      \(([0-9\-_.]+)(, .*)?\) # contains version string surrounded by brackets
-      $                      # at the end of the line.
-    ]x                       # Ignore whitespace to allow these comments.
+      ^([A-Za-z0-9\-_.]+) # Plugin name starts at the start of the line.
+      \                   # Version is separated by a space character,
+      \(                  # surrounded by brackets,
+        ([0-9\-_.]+)      # consists of numbers, hyphens, underscore, dot,
+        (, .*)?           # optionally followed by a comma space and word
+      \)
+      $                   # at the end of the line.
+    ]x                    # Ignore whitespace to allow these comments.
 
     # Regexp to determine whether plugins need to be reinstalled
     NEEDS_REINSTALL = %r[
@@ -48,7 +51,7 @@ module Derelict
       # Retrieves an array of the plugin lines in the output
       def plugin_lines
         return [] if output.match /no plugins installed/i
-        output.lines
+        output.lines.grep(/^\w/)
       end
 
       # Parses a single line of the output into a Plugin object

data/spec/derelict/parser/plugin_list_spec.rb

@@ -1,22 +1,25 @@
 require "spec_helper"
 
 describe Derelict::Parser::PluginList do
-  subject { Derelict::Parser::PluginList.new output }
+  let(:parser) { Derelict::Parser::PluginList.new output }
   let(:output) { nil }
+  subject { parser }
 
   it "is autoloaded" do
     should be_a Derelict::Parser::PluginList
   end
 
-  context "with valid output" do
-    let(:output) {
-      <<-END.gsub /^ +/, ""
-        foo (2.3.4)
-        bar (1.2.3, system)
-      END
-    }
+  describe "#plugins" do
+    subject { parser.plugins }
+
+    context "with valid output" do
+      let(:output) {
+        <<-END.gsub /^ +/, ""
+          foo (2.3.4)
+          bar (1.2.3, system)
+        END
+      }
 
-    describe "#plugins" do
       subject { Derelict::Parser::PluginList.new(output).plugins }
       let(:foo) { Derelict::Plugin.new "foo", "2.3.4" }
       let(:bar) { Derelict::Plugin.new "bar", "1.2.3" }
@@ -26,35 +29,45 @@ describe Derelict::Parser::PluginList do
       let(:expected_logs) {[
         "DEBUG pluginlist: Successfully initialized Derelict::Parser::PluginList instance\n",
       ]}
-    end
-  end
 
-  context "with plugins needing re-install" do
-    let(:output) {
-      <<-END.gsub /^ {8}/, ""
-        The following plugins were installed with a version of Vagrant
-        that had different versions of underlying components. Because
-        these component versions were changed (which rarely happens),
-        the plugins must be uninstalled and reinstalled.
+      context "with version constraints" do
+        let(:output) {
+          <<-END.gsub /^ {12}/, ""
+            foo (5.6.7)
+              - Version Constraint: 5.6.7
+            bar-baz (0.1.1, system)
+          END
+        }
 
-        To ensure that all the dependencies are properly updated as well
-        it is _highly recommended_ to do a `vagrant plugin uninstall`
-        prior to reinstalling.
+        let(:foo) { Derelict::Plugin.new "foo", "5.6.7" }
+        let(:bar) { Derelict::Plugin.new "bar-baz", "0.1.1" }
+        it { should eq Set[foo, bar] }
+      end
+    end
 
-        This message will not go away until all the plugins below are
-        either uninstalled or uninstalled then reinstalled.
+    context "with plugins needing re-install" do
+      let(:output) {
+        <<-END.gsub /^ {10}/, ""
+          The following plugins were installed with a version of Vagrant
+          that had different versions of underlying components. Because
+          these component versions were changed (which rarely happens),
+          the plugins must be uninstalled and reinstalled.
 
-        The plugins below will not be loaded until they're uninstalled
-        and reinstalled:
+          To ensure that all the dependencies are properly updated as well
+          it is _highly recommended_ to do a `vagrant plugin uninstall`
+          prior to reinstalling.
 
-        foo, bar
-        foo (2.3.4)
-        bar (1.2.3)
-      END
-    }
+          This message will not go away until all the plugins below are
+          either uninstalled or uninstalled then reinstalled.
 
-    describe "#plugins" do
-      subject { Derelict::Parser::PluginList.new(output).plugins }
+          The plugins below will not be loaded until they're uninstalled
+          and reinstalled:
+
+          foo, bar
+          foo (2.3.4)
+          bar (1.2.3)
+        END
+      }
 
       it "should raise NeedsReinstall" do
         expect { subject }.to raise_error(Derelict::Parser::PluginList::NeedsReinstall)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: derelict
 version: !ruby/object:Gem::Version
-  version: 0.6.2.travis.150
+  version: 0.6.2.travis.152
 platform: ruby
 authors:
 - Brad Feehan