isolate-scenarios 0.0.2 → 0.1.0

data/.gitignore

@@ -1,21 +1,5 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
 coverage
-rdoc
+doc
 pkg
-
-## PROJECT::SPECIFIC
+.yardoc
+tags

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem "thor", "~> 0.14.0"
+gem "isolate", "~> 2.1.2"
+
+group :development do
+  gem "rspec", "~> 1.3.0"
+  gem "yard", "~> 0.6.0"
+
+  gem "jeweler", "~> 1.5.0.pre2"
+end

data/Gemfile.lock

@@ -0,0 +1,23 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    isolate (2.1.2)
+    jeweler (1.5.0.pre2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rspec (1.3.0)
+    thor (0.14.0)
+    yard (0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  isolate (~> 2.1.2)
+  jeweler (~> 1.5.0.pre2)
+  rspec (~> 1.3.0)
+  thor (~> 0.14.0)
+  yard (~> 0.6.0)

data/README.rdoc

@@ -12,24 +12,31 @@ You need the gem first:
 
   gem install isolate-scenarios
 
-Now head over to your project. There are two additions you'll need. First, you need an IsolateScenario file, which describes your gem dependencies, as well as the gem you'll want to test different versions of:
-
- baseline do
-   # This is the same syntax as isolate's Isolate file
-   gem 'puppet', '= 0.24.8'
-   gem 'facter', '>= 1.5.4'
-   gem 'highline', '>= 1.5.0'
-   gem 'builder', '>= 2.1.2'
- end
-
- # This is the gem we'll be testing different versions of
- # first arg is the gem name, and all other args are versions to test
- gem_version_scenario 'activesupport',
-   '2.1.2',
-   '2.2.3',
-   '2.3.5',
-   '2.3.8',
-   '3.0.0.beta4'
+Now head over to your project. There are two additions you'll need. First, you need an Isolate file, which describes your gem dependencies, as well as the gem you'll want to test different versions of:
+
+ # These are dependencies that don't need to vary
+ # See isolate documentation for more detail: http://github.com/jbarnette/isolate
+ gem 'puppet', '= 0.24.8'
+ gem 'facter', '>= 1.5.4'
+ gem 'highline', '>= 1.5.0'
+ gem 'builder', '>= 2.1.2'
+
+ # This is the gem we'll be testing different versions of.
+ # It's similar to the normal `gem` usage, except you don't give a version as a second argument,
+ # And it recognizes two additional options, :scenarios and :default_scenario
+ gem 'activesupport', :scenarios => %w{
+                                       2.1.2
+                                       2.2.3
+                                       2.3.5
+                                       2.3.8
+                                       3.0.0.beta4
+                                    },
+                      # The value of :scenarios is a list of version strings
+
+                      :default_scenario => '2.3.8'
+                      # The value of default_scenario will be used when you don't
+                      # explicitly specify a scenario to run. If you don't specify this,
+                      # the last scenario is used.
 
 To verify this is setup, you can use 'isolate-scenarios list' to show them:
 
@@ -37,25 +44,28 @@ To verify this is setup, you can use 'isolate-scenarios list' to show them:
  * 2.1.2
  * 2.2.3
  * 2.3.5
- * 2.3.8
+ * 2.3.8 (default)
  * 3.0.0.beta4
 
-Next, you'll need to update your test suite's helper, typically spec/spec_helper.rb or test/test_helper.rb. You need to place this line as soon as you can in the file:
+Next, you'll need to update your test suite's helper, typically spec/spec_helper.rb or test/test_helper.rb. You need to place these lines as soon as you can in the file:
 
-  require 'isolate/scenarios/now'
+  require 'isolate/scenarios'
+  require 'isolate/now'
+
+Technically this is a third task, but you may also to add isolate-scenarios as a development dependency (http://docs.rubygems.org/read/chapter/20#dependencies) of your library. This will vary depending on how you manage your gem's dependencies.
 
 Now, when you run your tests, it will default to using the last version you specified. For example:
 
   $ rake spec
   (in shadow_puppet)
-  Activating scenario: activesupport-3.0.0.beta4
+  Activating default scenario: activesupport-2.3.8
   # omitted
 
 If you want to test against a specific scenario, you can specify it as an environment variable:
 
-  $ rake spec ISOLATE_SCENARIO=2.3.8
+  $ rake spec ISOLATE_ACTIVESUPPORT_SCENARIO=3.0.0.beta4
   (in shadow_puppet)
-  Activating scenario: activesupport-2.3.8
+  Activating scenario: activesupport-3.0.0.beta4
   # omitted
    
 This is cool and all, but we still would love to test all the scenarios in one shot. 'isolate-scenarios rake' lets you just do that. This will iterate over each scenario, and invoke rake with any args you pass it.
@@ -75,14 +85,16 @@ This is cool and all, but we still would love to test all the scenarios in one s
   # omitted
 
   (in shadow_puppet)
-  Activating scenario: activesupport-2.3.8
+  Activating (default) scenario: activesupport-2.3.8
   # omitted
 
-== Limitations
+  (in shadow_puppet)
+  Activating scenario: activesupport-3.0.0.beta4
+  # omitted
 
-Most projects I've worked on that need something like this only vary across one gem. As a result, gem_version_scenario only works for specifying one gem that varies. I tried coming up for some better defining multiple ones, but not having run into that situation, I passed for now.
+== Limitations
 
-Some of the API may be slightly limited because I was going for the simplest case that worked to test in isolation for a project. The 'now!' method, and others, aren't nearly as flexible as isolate proper.
+While you can define multiple gems with scenarios, using `isolate-scenarios rake` will not try to test different combinations of the gem versions at this time.
 
 There can be a bit of redudancy in gem dependency, ie you might specify them in your Rakefile via jeweler, or in Gemfile, or in Isolate, etc. isolate-scenarios doesn't try to reduce that redudancy at all yet.
 

data/Rakefile

@@ -1,19 +1,17 @@
 require 'rubygems'
+require "bundler/setup"
 require 'rake'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "isolate-scenarios"
-    gem.version = "0.0.2"
+    gem.version = "0.1.0"
     gem.summary = %Q{Tool for testing libraries using different senarios of gem versions}
     gem.description = %Q{Tool for testing libraries using different senarios of gem versions}
     gem.email = "josh@technicalpickles.com"
     gem.homepage = "http://github.com/technicalpickles/isolate-scenarios"
     gem.authors = ["Joshua Nichols"]
-    gem.add_dependency "thor"
-    gem.add_dependency "isolate"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -33,16 +31,10 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+task :spec
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "isolate-scenarios #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
 end

data/isolate-scenarios.gemspec

@@ -5,45 +5,45 @@
 
 Gem::Specification.new do |s|
   s.name = %q{isolate-scenarios}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-07-01}
+  s.date = %q{2010-08-31}
   s.default_executable = %q{isolate-scenarios}
   s.description = %q{Tool for testing libraries using different senarios of gem versions}
   s.email = %q{josh@technicalpickles.com}
   s.executables = ["isolate-scenarios"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "IsolateScenarios",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/isolate-scenarios",
-     "isolate-scenarios.gemspec",
-     "lib/isolate-scenarios.rb",
-     "lib/isolate/scenarios.rb",
-     "lib/isolate/scenarios/cli.rb",
-     "lib/isolate/scenarios/now.rb",
-     "lib/isolate/scenarios/sandbox.rb",
-     "spec/isolate-scenarios_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".gitignore",
+    "Gemfile",
+    "Gemfile.lock",
+    "Isolate",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "bin/isolate-scenarios",
+    "isolate-scenarios.gemspec",
+    "lib/isolate-scenarios.rb",
+    "lib/isolate/scenarios.rb",
+    "lib/isolate/scenarios/cli.rb",
+    "lib/isolate/scenarios/extensions.rb",
+    "spec/isolate-scenarios_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/isolate-scenarios}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Tool for testing libraries using different senarios of gem versions}
   s.test_files = [
     "spec/isolate-scenarios_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -51,18 +51,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<isolate>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.14.0"])
+      s.add_runtime_dependency(%q<isolate>, ["~> 2.1.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<isolate>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<thor>, ["~> 0.14.0"])
+      s.add_dependency(%q<isolate>, ["~> 2.1.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<isolate>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<thor>, ["~> 0.14.0"])
+    s.add_dependency(%q<isolate>, ["~> 2.1.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
   end
 end
 

data/lib/isolate/scenarios.rb

@@ -1,12 +1,32 @@
 require 'isolate'
-require 'isolate/scenarios/sandbox'
+require 'isolate/scenarios/extensions'
 require 'isolate/scenarios/cli'
 
-module Isolate
-  module Scenarios
-    def self.now!
-      @@sandbox = Isolate::Scenarios::Sandbox.new
-      @@sandbox.activate
+Isolate::Entry.class_eval do
+  include Isolate::Scenarios::Entry
+end
+
+Isolate::Sandbox.class_eval do
+  include Isolate::Scenarios::Entry
+end
+
+Isolate::Events.watch(Isolate::Sandbox, :activating) do |sandbox|
+  sandbox.entries.each do |entry|
+    if entry.scenarios
+      selected_scenario_version = if ENV[entry.scenario_env_variable]
+                                    entry.scenarios.detect do |scenario|
+                                      ENV[entry.scenario_env_variable] == "#{entry.name}-#{scenario}"
+                                    end
+                                  elsif entry.default_scenario
+                                    entry.default_scenario
+                                  else
+                                    entry.scenarios.last
+                                  end
+
+      if selected_scenario_version
+        puts "Activating#{' default' if entry.default_scenario == selected_scenario_version} scenario: #{entry.name}-#{selected_scenario_version}"
+        entry.update(selected_scenario_version)
+      end
     end
   end
 end

data/lib/isolate/scenarios/cli.rb

@@ -6,11 +6,15 @@ module Isolate
 
       desc "list", "list scenarios"
       def list
-        sandbox = Isolate::Scenarios::Sandbox.new
+        sandbox = Isolate::Sandbox.new
 
-        puts "#{sandbox.gem_to_vary}:"
-        sandbox.versions.each do |version|
-          puts "* #{sandbox.gem_to_vary}-#{version}"
+        sandbox.entries_with_scenarios.each do |entry|
+          puts "#{entry.name}:"
+
+          entry.scenarios.each do |scenario|
+            is_default_scenario = scenario == entry.default_scenario
+            puts "* #{scenario} #{'(default)' if is_default_scenario}"
+          end
         end
       end
 
@@ -18,10 +22,12 @@ module Isolate
       def rake(*)
         ARGV.delete('rake')
 
-        sandbox = Isolate::Scenarios::Sandbox.new
+        sandbox = Isolate::Sandbox.new
 
-        sandbox.versions.each do |version|
-          system "rake ISOLATE_SCENARIO=#{sandbox.gem_to_vary}-#{version} #{ARGV.join(' ')}"
+        sandbox.entries_with_scenarios.each do |entry|
+          entry.scenarios.each do |scenario|
+            system "rake #{entry.scenario_env_variable}=#{entry.name}-#{scenario} #{ARGV.join(' ')}"
+          end
         end
       end
     end

data/lib/isolate/scenarios/extensions.rb

@@ -0,0 +1,27 @@
+module Isolate
+  module Scenarios
+    # Extension to Isolate::Entry to be scenario friendly
+    module Entry
+      def scenarios
+        options[:scenarios]
+      end
+
+      def default_scenario
+        options[:default_scenario]
+      end
+
+      def scenario_env_variable
+        "ISOLATE_#{name.upcase.gsub('-', '_')}_SCENARIO"
+      end
+    end
+
+    # Extension to Isolate::Sandbox to be scenario friendly
+    module Sandbox
+      def entries_with_scenarios
+        entries.select do |entry|
+          entry.scenarios
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'bundler/setup'
 require 'spec'
 require 'spec/autorun'
 
 require 'isolate-scenarios'
-Isolate::Scenarios.now!
 
 Spec::Runner.configure do |config|
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -14,47 +14,80 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: isolate-scenarios
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+        - 14
+        - 0
+        version: 0.14.0
+  name: thor
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   name: isolate
+  requirement: *id002
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+        version: 1.3.0
   name: rspec
+  requirement: *id003
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  name: yard
+  requirement: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id003
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
+        - pre2
+        version: 1.5.0.pre2
+  name: jeweler
+  requirement: *id005
+  prerelease: false
 description: Tool for testing libraries using different senarios of gem versions
 email: josh@technicalpickles.com
 executables: 
@@ -67,7 +100,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- IsolateScenarios
+- Gemfile
+- Gemfile.lock
+- Isolate
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -76,8 +111,7 @@ files:
 - lib/isolate-scenarios.rb
 - lib/isolate/scenarios.rb
 - lib/isolate/scenarios/cli.rb
-- lib/isolate/scenarios/now.rb
-- lib/isolate/scenarios/sandbox.rb
+- lib/isolate/scenarios/extensions.rb
 - spec/isolate-scenarios_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -86,8 +120,8 @@ homepage: http://github.com/technicalpickles/isolate-scenarios
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/isolate/scenarios/now.rb

@@ -1,2 +0,0 @@
-require 'isolate/scenarios'
-Isolate::Scenarios.now!

data/lib/isolate/scenarios/sandbox.rb

@@ -1,43 +0,0 @@
-module Isolate
-  module Scenarios
-    class Sandbox
-      attr_accessor :gem_to_vary, :versions
-
-      def current_scenario
-        if ENV['ISOLATE_SCENARIO']
-          scenario = versions.detect do |version|
-            ENV['ISOLATE_SCENARIO']== "#{gem_to_vary}-#{version}"
-          end
-          scenario || raise("No scenario defined for #{ENV['ISOLATE_SCENARIO']}")
-        else
-          versions.last
-        end
-      end
-
-      def initialize
-        file = "IsolateScenarios"
-        instance_eval IO.read(file), file, 1
-      end
-
-      def baseline(&block)
-        @baseline_sandbox = Isolate::Sandbox.new(&block)
-      end
-
-      def gem_version_scenario(gem, *versions)
-        @gem_to_vary = gem
-        @versions = versions.flatten
-      end
-
-      def activate
-        puts "Activating scenario: #{gem_to_vary}-#{current_scenario}"
-
-        @baseline_sandbox ||= Isolate::Sandbox.new
-        @baseline_sandbox.gem gem_to_vary, current_scenario
-
-        @baseline_sandbox.activate(Isolate.env)
-      end
-
-    end
-  end
-end
-