development 1.0.4 → 1.0.5

data/CHANGELOG.md

@@ -6,3 +6,5 @@ Update for Docs.
 Update for preventing multiple-load.
 Oops! Configuration-file enabling was commented out. So 1.0.3 is the first working version!
 ... And then left comments in.
+Fix for enabling by gemset.
+

data/lib/development.rb

@@ -214,9 +214,12 @@ module ::Development
     @enabled_gems.clear
     @disabled_gems.clear
     @gemsets.clear
+    @gem_locations.clear
     @general_load_paths.clear
     @loaded_gems.clear
     @named_directories.clear
+    @locations.clear
+    @enable_for_all = false
     
     return self
     
@@ -749,9 +752,17 @@ module ::Development
       when :enable
         
         if gems
-          gems.each do |this_gem, true_value|
-            @enabled_gems.push( this_gem )
-            @disabled_gems.delete( this_gem )
+          gems.each do |this_gem_or_gemset, true_value|
+            if gemset = @gemsets[ this_gem_or_gemset ]
+              gemset.each do |this_gem|
+                @enabled_gems.push( this_gem )
+                @disabled_gems.delete( this_gem )
+              end
+            else
+              this_gem = this_gem_or_gemset
+              @enabled_gems.push( this_gem )
+              @disabled_gems.delete( this_gem )
+            end
           end
         else
           @disabled_gems.delete_if do |this_gem, true_value|
@@ -764,9 +775,17 @@ module ::Development
       when :disable
 
         if gems
-          gems.each do |this_gem, true_value|
-            @disabled_gems.push( this_gem )
-            @enabled_gems.delete( this_gem )
+          gems.each do |this_gem_or_gemset, true_value|
+            if gemset = @gemsets[ this_gem_or_gemset ]
+              gemset.each do |this_gem|
+                @disabled_gems.push( this_gem )
+                @enabled_gems.delete( this_gem )
+              end
+            else
+              this_gem = this_gem_or_gemset
+              @disabled_gems.push( this_gem )
+              @enabled_gems.delete( this_gem )
+            end
           end
         else
           @enabled_gems.delete_if do |this_gem, true_value|

data/spec/development_spec.rb

@@ -49,6 +49,8 @@ describe ::Development do
 
   it 'can parse an enable/disable expression' do
 
+    ::Development.parse_gemset_expression( '=some_gemset some_gem, some_other_gem, some_gemset' )
+
     ::Development.parse_enable_disable_expression( '!enable some_gem, some_other_gem, some_gemset' )
     ::Development.enabled_for_all?.should == false
     ::Development.enabled_gems.should == [ :some_gem, :some_other_gem, :some_gemset ]
@@ -78,6 +80,16 @@ describe ::Development do
     ::Development.enabled_for_all?.should == false
     ::Development.enabled_gems.should == [ ]
     ::Development.disabled_gems.should == [ :some_gemset, :some_gem, :some_other_gem ]
+  
+    ::Development.parse_enable_disable_expression( '!enable some_gemset' )
+    ::Development.enabled_for_all?.should == false
+    ::Development.enabled_gems.should == [ :some_gem, :some_other_gem, :some_gemset ]
+    ::Development.disabled_gems.should == [ ]
+
+    ::Development.parse_enable_disable_expression( '!disable' )
+    ::Development.enabled_for_all?.should == false
+    ::Development.enabled_gems.should == [ ]
+    ::Development.disabled_gems.should == [ :some_gem, :some_other_gem, :some_gemset ]
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: development
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors: