qor_test 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in qor_test.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -20,15 +20,11 @@
       gem  'rails', ['3.1', '3.2']
     end
 
-  test/test_helper.rb
-
-    load_dummy_rails_env #:models_path => [], :migrations_path => []
-
-
   Run:
 
-    qor_test -e default -c 'ruby test/xxxx'
-    qor_test -e 1.8.7 -c 'rake test'
+    qor_test
+    COMMAND='ruby test/xxxx' qor_test -e default
+    COMMAND='rake test' qor_test -e 1.8.7
 
 ## Contributing
 

data/Rakefile

@@ -10,4 +10,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task :default => :test
+task :default => :install

data/bin/qor_test.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "optparse"
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "qor_test"
+require "qor_test/configuration"
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.on( '-e', '--env env', 'Test Env') do |env|
+    options[:env] = env
+  end
+
+  opts.on( '-c', '--clean', 'Clean up temporary files') do
+    puts "Cleaning temporary files..."
+    FileUtils.rm_rf(Dir[File.join(Qor::Test::CLI.temp_directory, "qor_test-gemfiles-*")])
+    exit
+  end
+
+  opts.on( '-p', '--pretend', 'Skip run command, only generate Gemfiles') do
+    options[:pretend] = true
+  end
+
+  opts.on( '-i', '--init', 'Init') do
+    Qor::Test::CLI.init
+    exit
+  end
+
+  opts.on( '-s', '--sample', 'Create sample configuration') do
+    Qor::Test::CLI.copy_sample_configuration
+    exit
+  end
+
+  opts.on( '-h', '--help', 'Display this help') do
+    puts opts
+    exit
+  end
+
+  opts.on( '-v', '--version', 'Show version number') do |version|
+    puts "Version: #{Qor::Test::VERSION}"
+    exit
+  end
+end.parse!
+
+# Default command to run tests
+options[:command] = ENV['COMMAND'] || "rake #{File.exist?('spec') ? 'spec' : 'test'}"
+
+# Run all envs by default
+envs = options[:env] ? [options[:env]] : Qor::Test::Configuration.envs
+envs = [nil] if envs.size == 0
+
+$case_num = 0
+scripts = envs.map do |env|
+  Qor::Test::CLI.new(options.merge(:env => env)).run.scripts
+end
+scripts.unshift "total_cases_num=#{$case_num}"
+
+open(ENV['QOR_TEST_SCRIPT_FILE'] || 'qor_test.sh', 'a') do |f|
+  f.puts scripts.compact.join("\n")
+end

data/lib/qor_test.rb

@@ -1,10 +1,10 @@
 require 'qor_dsl'
-require 'qor_test/version'
-require 'qor_test/bundler'
-require 'qor_test/gem'
-require 'qor_test/configuration'
-require 'qor_test/test_help'
 require 'qor_test/cli'
+require 'qor_test/configuration'
+require 'qor_test/gemfile'
+require 'qor_test/gem'
+require 'qor_test/version'
+require 'qor_test/rubies'
 
 module Qor
   module Test

data/lib/qor_test/cli.rb

@@ -1,92 +1,88 @@
-require "optparse"
 require 'tempfile'
 require "fileutils"
 
 module Qor
   module Test
     class CLI
-      BUNDLER_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).freeze
-      attr_accessor :options
+      attr_accessor :options, :scripts
 
       def initialize(options={})
         self.options = options
+        self.scripts = []
       end
 
-      def run
-        gemfiles = Qor::Test::Bundler.new(options).generate_gemfiles
-
-        puts ">> Generated #{gemfiles.count} Gemfile\n\n"
-
-        gemfiles.map do |gemfile|
-          begin
-            new_gemfile = "QorTest_" + File.basename(gemfile)
-            FileUtils.cp(gemfile, new_gemfile)
-            with_clean_gemfile(new_gemfile) do
-              puts ">> BUNDLE_GEMFILE=#{gemfile}"
-              ["bundle update", "#{options[:command]}\n\n"].map do |command|
-                puts ">> #{command}"
-                system(command) unless options[:pretend]
-              end
-            end
-          ensure
-            FileUtils.rm(new_gemfile)
-          end
-        end
+      def gemfile
+        @gemfile ||= Qor::Test::Gemfile.new(options)
       end
 
-      def with_clean_gemfile(gemfile)
-        original_env = {}
-        BUNDLER_ENV_VARS.each do |key|
-          original_env[key] = ENV[key]
-          ENV[key] = nil
-        end
-
-        ENV['BUNDLE_GEMFILE'] = gemfile
-        yield
-      ensure
-        original_env.each { |key, value| ENV[key] = value }
+      def gemfiles
+        @gemfiles ||= gemfile.generate_gemfiles.reverse
       end
 
-      def self.option_parser
-        options = {}
-
-        OptionParser.new do |opts|
-          opts.on( '-e', '--env env', 'Test Env') do |env|
-            options[:env] = env
-          end
-
-          opts.on( '-c', '--command command', 'Command') do |command|
-            options[:command] = command
-          end
-
-          opts.on( '-C', '--clean', 'Clean old temp files') do
-            puts "Cleaning temp files..."
-            FileUtils.rm_rf(Dir[File.join(temp_directory, "qor_test-tmp-*")])
-            exit
-          end
-
-          opts.on( '-p', '--pretend', 'Skip run command, only generate Gemfiles') do
-            options[:pretend] = true
-          end
+      def rubies
+        gemfile.ruby_versions
+      end
 
-          opts.on( '-h', '--help', 'Display this help') do
-            puts opts
-            exit
+      def run
+        rubies.map do |version|
+          scripts << Qor::Test::Rubies.switch_ruby_version(version)
+          gemfiles.map do |file|
+            $case_num += 1
+            scripts << "echo -n '\n\e[01;31m[ENV #{gemfile.group_name}] \e[0m'"
+            scripts << "echo -n '\e[31mRunning case #{$case_num} with ruby #{version}, '$[$total_cases_num-#{$case_num}]' cases left\e[0m\n'"
+            run_with_gemfile(file)
           end
+        end
+        self
+      rescue Qor::Dsl::ConfigurationNotFound
+        puts "ConfigurationNotFound, please run `qor_test --init` in project's root to get a sample configuration"
+      end
 
-          opts.on( '-v', '--version', 'Show version number') do |version|
-            puts "Version: #{Qor::Test::VERSION}"
-            exit
-          end
-        end.parse!
+      def run_with_gemfile(file)
+        lock_file = "#{file}.lock"
+        temp_file = "QorTest_" + File.basename(file)
+        temp_lock = "#{temp_file}.lock"
+
+        # Copy Gemfile and Gemfile.lock if exist
+        scripts << "cp '#{file}' '#{temp_file}'"
+        scripts << "[ -f '#{lock_file}' ] && cp '#{lock_file}' '#{temp_lock}'"
+
+        # Export Gemfile
+        scripts << "echo '>> BUNDLE_GEMFILE=#{file}'"
+        scripts << "export BUNDLE_GEMFILE=#{temp_file}"
+
+        # Test commands. 1, bundle install, 2, rake test
+        [
+          "bundle install --quiet",
+          "#{options[:command]}".sub(/^(bundle\s+exec\s+)?/, 'bundle exec ')
+        ].map do |command|
+          scripts << "echo '>> #{command}'"
+          scripts << command unless options[:pretend]
+        end
 
-        options
+        # Backup & Cleanup
+        scripts << "[ -f '#{temp_lock}' ] && cp '#{temp_lock}' '#{lock_file}'"
+        [temp_file, temp_lock].map do |file|
+          scripts << "[ -f '#{file}' ] && rm '#{file}'"
+        end
       end
 
       def self.temp_directory
         tempfile = Tempfile.new('fake')
         File.dirname(tempfile.path)
       end
+
+      def self.copy_sample_configuration
+        FileUtils.mkdir_p(File.dirname(Qor::Test::Configuration.config_path))
+        FileUtils.cp(Qor::Test::Configuration.sample_file, Qor::Test::Configuration.config_path)
+        puts("Copied sample configuration to #{Qor::Test::Configuration.config_path}!")
+      end
+
+      def self.init
+        command = "sudo ln -nfs #{File.expand_path("../../../shell/qor_test", __FILE__)} /usr/bin/"
+        puts command
+        system command
+      end
     end
   end
 end

data/lib/qor_test/configuration.rb

@@ -1,78 +1,107 @@
+require 'digest/md5'
+
 module Qor
   module Test
-    module Configuration
+    class Configuration
       include Qor::Dsl
-      default_configs ["config/qor/test.rb"]
 
       node :source
       node :ruby
       node :gemspec
       node :gem
 
-      node :env do
-        node :gem
-        node :ruby
+      [:git, :platforms, :path, :group, :env].map do |name|
+        node name do
+          node :ruby
+          node :gem
+        end
       end
 
-      def self.gems(options={})
-        deep_find(:gem) do |n|
-          n.parent.root? || ((n.parent.config_name == :env) && n.parent.name.to_s == (options[:env] || 'default'))
-        end
+      def self.config_path
+        "config/qor/test.rb"
       end
 
-      def self.gemspecs(options={})
-        deep_find(:gemspec) do |n|
-          n.parent.root? || ((n.parent.config_name == :env) && n.parent.name.to_s == (options[:env] || 'default'))
-        end
+      def self.gemfile_path
+        [ENV['QOR_TEST_GEMFILE'], ENV['BUNDLE_GEMFILE'], 'Gemfile'].detect {|x| File.exist?(x.to_s)}
       end
 
-      def self.sources(options={})
-        deep_find(:source) do |n|
-          n.parent.root? || ((n.parent.config_name == :env) && n.parent.name.to_s == (options[:env] || 'default'))
-        end
+      def self.configuration_digest(options={})
+        hexdigest = Digest::MD5.hexdigest(options.inspect + File.read(config_path) + File.read(gemfile_path))
+        "qor_test-gemfiles-#{hexdigest}"
       end
-    end
 
-    class Gemfile
-      include Qor::Dsl
-      default_configs [ENV['QOR_TEST_GEMFILE'], ENV['BUNDLE_GEMFILE'], 'Gemfile']
+      def self.sample_file
+        File.expand_path("#{File.dirname(__FILE__)}/../../config/qor/test.rb")
+      end
 
-      node :source
-      node :ruby
-      node :gemspec
-      node :gem
+      def self.root_from_config
+        @root_from_config ||= Qor::Test::Configuration.load(config_path, :force => true)
+      end
 
-      node :git do
-        node :gem
+      def self.root_from_gemfile
+        @root_from_gemfile ||= Qor::Test::Configuration.load(gemfile_path, :force => true)
       end
 
-      node :platforms do
-        node :gem
+      def self.find_block(options={})
+        lambda do |node|
+          parent = node.parent
+          parent.root? || parent.is_node?(:env, options[:env] || 'default') || parent.is_node?(:group, 'test')
+        end
       end
 
-      node :path do
-        node :gem
+      def self.ruby_versions(options)
+        ruby_versions = [root_from_config, root_from_gemfile].map {|x| x.deep_find('ruby', &find_block(options)) }
+        ruby_versions.flatten.compact.map(&:value)
       end
 
-      node :group do
-        node :gem
+      def self.envs(options={})
+        envs = root_from_config.deep_find('env').map(&:value)
+        options[:env] ? envs.select {|x| x == options[:env]} : envs
       end
 
-      def self.gems(options={})
-        deep_find(:gem) do |n|
-          n.parent.root? || (n.parent.config_name != :group) || (n.parent.name.to_s == 'test')
+      {:gemspecs => :gemspec, :sources => :source}.map do |key, value|
+        self.class.class_eval do
+          define_method key do |options|
+            objs_from_config  = root_from_config.deep_find(value, &find_block(options))
+            objs_from_gemfile = root_from_gemfile.deep_find(value, &find_block(options))
+            [objs_from_config, objs_from_gemfile].flatten.compact
+          end
         end
       end
 
-      def self.gemspecs(options={})
-        deep_find(:gemspec) do |n|
-          n.parent.root? || (n.parent.config_name != :group) || (n.parent.name.to_s == 'test')
+      def self.combined_sources(options={})
+        sources(options).map { |source| "source #{source.value.inspect}\n" }.uniq.join("")
+      end
+
+      def self.combined_gemspecs(options={})
+        gemspecs(options).map do |gemspec|
+          "gemspec #{gemspec.value.nil? ? '' : gemspec.value.inspect.gsub(/^\{|\}$/,'')}\n"
+        end.uniq.join("")
+      end
+
+      def self.gems_set_from_config(options={})
+        all_gems = root_from_config.deep_find(:gem, &find_block(options)).inject({}) do |sum, node|
+          sum[node.name] ||= []
+          sum[node.name].concat Qor::Test::Gem.parse(node)
+          sum
+        end.values
+
+        gems_set = all_gems.length > 0 ? all_gems[0].product(*all_gems[1..-1]) : []
+        gems_set.map { |gems| gems_to_hash(gems) }
+      end
+
+      def self.gems_hash_from_gemfile(options={})
+        gems = root_from_gemfile.deep_find(:gem, &find_block(options)).map do |node|
+          Qor::Test::Gem.parse(node)[0]
         end
+        gems_to_hash(gems)
       end
 
-      def self.sources(options={})
-        deep_find(:source) do |n|
-          n.parent.root? || (n.parent.config_name != :group) || (n.parent.name.to_s == 'test')
+      private
+      def self.gems_to_hash(gems)
+        gems.inject({}) do |sum, gem|
+          sum[gem.name.to_s] = gem
+          sum
         end
       end
     end

data/lib/qor_test/gem.rb

@@ -7,9 +7,9 @@ module Qor
         self.name = node.name.to_s
         self.gem_option = gem_option
 
-        [:git, :path, :platforms].map do |x|
-          if node.parent.config_name.to_sym == x
-            self.options = {x => node.parent.value}.merge(node.parent.options)
+        [:git, :path, :platforms].map do |type|
+          if node.parent.is_node?(type)
+            self.options = {type => node.parent.value}.merge(node.parent.options)
           end
         end
       end

data/lib/qor_test/gemfile.rb

@@ -0,0 +1,53 @@
+module Qor
+  module Test
+    class Gemfile
+      attr_accessor :options
+
+      def initialize options={}
+        self.options = options
+      end
+
+      def ruby_versions
+        versions = Qor::Test::Configuration.ruby_versions(options)
+        versions.empty? ? [RUBY_VERSION] : versions
+      end
+
+      def group_name
+        Qor::Test::Configuration.envs(options)[0]
+      end
+
+      def generate_gemfiles
+        gems_set_from_config = Qor::Test::Configuration.gems_set_from_config(options)
+        gems_hash_from_gemfile = Qor::Test::Configuration.gems_hash_from_gemfile(options)
+        gemfile_length = [gems_set_from_config.length, 1].max
+
+        gemfile_dir = File.join(Qor::Test::CLI.temp_directory, Qor::Test::Configuration.configuration_digest(options))
+
+        if File.exist?(gemfile_dir)
+          Dir[File.join(gemfile_dir, '*')].select {|x| x !~ /.lock$/ }
+        else
+          FileUtils.mkdir_p(gemfile_dir)
+
+          (0...gemfile_length).map do |index|
+            filename = File.join(gemfile_dir, "Gemfile.#{index}")
+            write_gemfile(gems_set_from_config[index] || {}, gems_hash_from_gemfile, filename)
+          end
+        end
+      end
+
+      def write_gemfile(gems_from_config, gems_from_gemfile, filename)
+        gem_names = [gems_from_config.keys, gems_from_gemfile.keys].flatten.compact.uniq
+
+        gems = gem_names.map do |name|
+          gems_from_config[name] || gems_from_gemfile[name]
+        end.compact
+
+        File.open(filename, "w+") do |f|
+          f << Qor::Test::Configuration.combined_sources(options)
+          f << Qor::Test::Configuration.combined_gemspecs(options)
+          f << gems.map(&:to_s).join("\n")
+        end.path
+      end
+    end
+  end
+end

data/lib/qor_test/rubies.rb

@@ -0,0 +1,43 @@
+module Qor
+  module Test
+    class Rubies
+      class << self
+
+        def rvm?
+          %x(sh -c "command -v rvm").size > 0
+        end
+
+        def rbenv?
+          %x(sh -c "command -v rbenv").size > 0
+        end
+
+        def version_manager_installed?
+          rvm? || rbenv?
+        end
+
+        def versions
+          if rvm?
+            `rvm list strings`.split("\n")
+          elsif rbenv?
+            `rbenv versions | cut -d '(' -f1`.split("\n").map {|x| x.sub(/\*/,'') }.map(&:strip)
+          end
+        end
+
+        def matched_version(version)
+          result = versions.select {|x| x =~ Regexp.new(version) }[-1]
+          puts("ruby '#{version}' is not installed! please install it first!") && exit unless result
+          result
+        end
+
+        def switch_ruby_version(version)
+          if rvm?
+            "rvm use #{matched_version(version)}"
+          elsif rbenv?
+            "export RBENV_VERSION=#{matched_version(version)}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/qor_test/version.rb

@@ -1,5 +1,5 @@
 module Qor
   module Test
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/shell/qor_test

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+export QOR_TEST_SCRIPT_FILE=$(mktemp /tmp/qor_test-gemfiles-scripts-XXXXXXXXXX)
+qor_test.rb $*
+[ -f $QOR_TEST_SCRIPT_FILE ] && chmod +x $QOR_TEST_SCRIPT_FILE
+[ -f $QOR_TEST_SCRIPT_FILE ] && source $QOR_TEST_SCRIPT_FILE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_test
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qor_dsl
@@ -31,7 +31,7 @@ description: ! 'Qor Test: Make test easier!'
 email:
 - wosmvp@gmail.com
 executables:
-- qor_test
+- qor_test.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -41,15 +41,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/qor_test
+- bin/qor_test.rb
 - lib/qor_test.rb
-- lib/qor_test/bundler.rb
 - lib/qor_test/cli.rb
 - lib/qor_test/configuration.rb
 - lib/qor_test/gem.rb
-- lib/qor_test/test_help.rb
+- lib/qor_test/gemfile.rb
+- lib/qor_test/rubies.rb
 - lib/qor_test/version.rb
 - qor_test.gemspec
+- shell/qor_test
 homepage: ''
 licenses: []
 post_install_message: 
@@ -70,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'Qor Test: Make test easier!'
 test_files: []
-has_rdoc: 

data/bin/qor_test

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require "pathname"
-bin_file = Pathname.new(__FILE__).realpath
-$:.unshift File.expand_path("../../lib", bin_file)
-
-require "qor_test"
-
-options = Qor::Test::CLI.option_parser
-Qor::Test::CLI.new(options).run

data/lib/qor_test/bundler.rb

@@ -1,70 +0,0 @@
-module Qor
-  module Test
-    class Bundler
-      attr_accessor :options
-
-      def initialize options={}
-        self.options = options
-      end
-
-      def gems_set_from_config
-        gems = Qor::Test::Configuration.gems(options).inject({}) do |s, node|
-          s[node.name] ||= []
-          s[node.name].concat Qor::Test::Gem.parse(node)
-          s
-        end.values
-
-        gems.length > 0 ? gems[0].product(*gems[1..-1]) : []
-      end
-
-      def gems_hash_from_gemfile
-        Qor::Test::Gemfile.gems(options).inject({}) do |s, node|
-          s[node.name.to_s] = Qor::Test::Gem.parse(node)[0]
-          s
-        end
-      end
-
-      def gemspecs
-        [Qor::Test::Configuration.gemspecs(options), Qor::Test::Gemfile.gemspecs(options)].flatten.compact
-      end
-
-      def sources
-        [Qor::Test::Configuration.sources(options), Qor::Test::Gemfile.sources(options)].flatten.compact
-      end
-
-      def generate_gemfiles
-        gems_set  = gems_set_from_config
-        gems_hash = gems_hash_from_gemfile
-        gems_name = gems_hash.keys
-        gemfile_length = [gems_set.length, 1].max
-
-        gemfile_dir = File.join(Qor::Test::CLI.temp_directory, "qor_test-tmp-#{Time.now.to_i}")
-        FileUtils.mkdir_p(gemfile_dir)
-
-        filenames = (0...gemfile_length).map do |t|
-          gems = []
-          gem_names = gems_set[t].map(&:name)
-          gem_names.concat(gems_name).uniq!
-
-          gem_names.map do |name|
-            gems << (gems_set[t].select {|g| g.name == name}[0] || gems_hash[name])
-          end
-
-          file = File.new(File.join(gemfile_dir, "Gemfile.#{t}"), "w+")
-          # Add sources
-          file << sources.map { |source| "source #{source.value.inspect}\n" }.uniq.join("")
-          # Add gemspec
-          file << gemspecs.map do |gemspec|
-            "gemspec #{gemspec.value.nil? ? '' : gemspec.value.inspect.gsub(/^\{|\}$/,'')}\n"
-          end.uniq.join("")
-          # Add gems
-          file << gems.map(&:to_s).join("\n")
-          file.close
-          file.path
-        end
-
-        filenames
-      end
-    end
-  end
-end

data/lib/qor_test/test_help.rb

@@ -1,9 +0,0 @@
-module Qor
-  module Test
-    class TestHelp
-
-      def self.load_dummy_rails_env(options={})
-      end
-    end
-  end
-end